forked from Minki/linux
f7cc38b16e
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUDOW+AAoJEHm+PkMAQRiGOXYH/00TPKm8PdM5cXXG2YYYv9eT W99K7KD2i0/qiVtlGgjjvB7fO3K0HcZusTd2jmVd8IWntXvauq7Zpw5YZkjwu4KX Y1HCwwCd2aw0FoqgrJhNP3+j5Cr1BD/HLtbffjCe+A3tppOIis4Bwt2wJOoYlXpS hU9Jxxc4lcRo8YKbffouDo7PIneWeJy8N+WGpUR5BfJIEK0ZZtCUqn3/3WLX4FYu fE6uiF/bACTpKXU/mo4dDbhZp439H/QdwQc9B0F8+8CBDMXKaNHrPV7kN36T2SWa fD4boikTsi/yh9Ks1fvHbvNq2N0ihoMnja+vLRyvjAcAQv2fKG3OZtYgFWSdghU= =Xknd -----END PGP SIGNATURE----- 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 |
||
---|---|---|
.. | ||
sisusbvga | ||
adutux.c | ||
appledisplay.c | ||
cypress_cy7c63.c | ||
cytherm.c | ||
ehset.c | ||
emi26.c | ||
emi62.c | ||
ezusb.c | ||
ftdi-elan.c | ||
idmouse.c | ||
iowarrior.c | ||
isight_firmware.c | ||
Kconfig | ||
ldusb.c | ||
legousbtower.c | ||
lvstest.c | ||
Makefile | ||
rio500_usb.h | ||
rio500.c | ||
trancevibrator.c | ||
usb3503.c | ||
usb_u132.h | ||
usblcd.c | ||
usbled.c | ||
usbsevseg.c | ||
usbtest.c | ||
uss720.c | ||
yurex.c |