projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efb540c 2ce7598)
Merge tag 'v3.17-rc4' into next
authorFelipe Balbi <balbi@ti.com>
Mon, 8 Sep 2014 19:39:01 +0000 (14:39 -0500)
committerFelipe Balbi <balbi@ti.com>
Mon, 8 Sep 2014 19:39:01 +0000 (14:39 -0500)
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

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

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/dwc3/dwc3-omap.c
Simple merge
diff --cc drivers/usb/gadget/udc/Kconfig
Simple merge
diff --cc drivers/usb/gadget/udc/r8a66597-udc.c
Simple merge
diff --cc drivers/usb/phy/phy-msm-usb.c
Simple merge