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
..
ffs-aio-example	tools: ffs-aio-example: add license information	2014-06-30 12:53:36 -05:00
usbip	usbip: move usbip userspace code out of staging	2014-08-25 10:38:56 -07:00
ffs-test.c	tools: ffs-test: add compatibility code for old kernels	2014-09-02 09:16:46 -05:00
hcd-tests.sh	USB: usbtest - add alignment tests to test script	2011-01-22 19:42:14 -08:00
Makefile	Revert "tools: ffs-test: convert to new descriptor format fixing compilation error"	2014-06-27 10:41:00 -05:00
testusb.c	testusb: remove all mentions of 'usbfs'	2013-02-08 12:15:24 -08:00