Felipe Balbi f7cc38b16e Linux 3.17-rc4 ... -----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		2014-09-08 14:39:01 -05:00
..
amd5536udc.c
amd5536udc.h
at91_udc.c
at91_udc.h
atmel_usba_udc.c	usb: atmel_usba_udc: fix it to deal with final dma channel	2014-08-19 09:24:41 -05:00
atmel_usba_udc.h
bcm63xx_udc.c
dummy_hcd.c
fotg210-udc.c
fotg210.h
fsl_mxc_udc.c
fsl_qe_udc.c
fsl_qe_udc.h
fsl_udc_core.c
fsl_usb2_udc.h
fusb300_udc.c
fusb300_udc.h
gadget_chips.h
goku_udc.c
goku_udc.h
gr_udc.c
gr_udc.h
Kconfig	Linux 3.17-rc4	2014-09-08 14:39:01 -05:00
lpc32xx_udc.c
m66592-udc.c
m66592-udc.h
Makefile
mv_u3d_core.c
mv_u3d.h
mv_udc_core.c
mv_udc.h
net2272.c
net2272.h
net2280.c
net2280.h
omap_udc.c
omap_udc.h
pch_udc.c	usb: pch_udc: usb gadget device support for Intel Quark X1000	2014-08-20 09:53:45 -05:00
pxa25x_udc.c
pxa25x_udc.h
pxa27x_udc.c
pxa27x_udc.h
r8a66597-udc.c	Linux 3.17-rc4	2014-09-08 14:39:01 -05:00
r8a66597-udc.h
s3c2410_udc.c
s3c2410_udc.h
s3c-hsudc.c
udc-core.c