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
..
acm_ms.c
audio.c	usb: gadget: f_uac1: use defined constants as defaults	2014-08-20 14:05:14 -05:00
cdc2.c
dbgp.c
ether.c
g_ffs.c
gmidi.c
hid.c
inode.c	usb: gadget: Fix return value check in ep_write()	2014-08-19 09:27:24 -05:00
Kconfig	usb: gadget: audio: convert to new interface of f_uac1	2014-08-20 14:04:58 -05:00
Makefile	usb: gadget: use $(srctree) instead of $(PWD) for includes	2014-08-29 15:53:46 -05:00
mass_storage.c
multi.c
ncm.c
nokia.c
printer.c
serial.c
tcm_usb_gadget.c
tcm_usb_gadget.h
webcam.c	usb: gadget: uvc: move module parameters from f_uvc	2014-09-08 08:49:37 -05:00
zero.c	usb: gadget: zero: Add support for interrupt EP	2014-08-27 14:13:18 -05:00