drtracing.org Git - deliverable/linux.git/commit

projects / deliverable / linux.git / commit

author	Felipe Balbi <balbi@ti.com>
	Mon, 8 Sep 2014 19:39:01 +0000 (14:39 -0500)
committer	Felipe Balbi <balbi@ti.com>
	Mon, 8 Sep 2014 19:39:01 +0000 (14:39 -0500)
commit	f7cc38b16e2741186253be3dff61a9d124112126
tree	efce170d7c0c4baf6924275e6a42d11fa47c9290	tree \| snapshot
parent	efb540c895d2cb77b1472edda6ca45d40719a041	commit \| diff
parent	2ce7598c9a453e0acd0e07be7be3f5eb39608ebd	commit \| diff

Merge tag 'v3.17-rc4' into next

Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-samsung-usb.h

Linux kernel - Deliverables

RSS Atom

This page took 0.039038 seconds and 5 git commands to generate.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/dwc3-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/uvc_video.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc/r8a66597-udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/phy-msm-usb.c	diff1 \|	diff2 \|	blob \| history