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
..
am35x.c	usb: phy: generic: allow multiples calls to usb_phy_generic_register()	2014-04-21 14:07:25 -05:00
blackfin.c	usb: musb: backfin: Introduce the use of the managed version of kzalloc	2014-06-30 12:26:57 -05:00
blackfin.h
cppi_dma.c	usb: musb: dma: merge ->start/stop into create/destroy	2013-07-29 13:53:18 +03:00
cppi_dma.h
da8xx.c	usb: phy: generic: allow multiples calls to usb_phy_generic_register()	2014-04-21 14:07:25 -05:00
davinci.c	usb: musb: davinci: use devm_ functions.	2014-06-30 12:26:48 -05:00
davinci.h
jz4740.c	usb: musb: register nop transceiver driver for jz4740	2014-07-10 08:36:50 -05:00
Kconfig	usb: musb: omap2plus bus glue needs USB host support	2014-05-14 09:23:32 -05:00
Makefile	usb: musb: add support for JZ4740 usb device controller	2013-12-20 09:53:24 -06:00
musb_am335x.c	usb: musb: Fix panic upon musb_am335x module removal	2014-06-27 10:53:06 -05:00
musb_core.c	usb: musb: core: Convert the musb_platform_reset to have a return value.	2014-07-16 09:59:58 -05:00
musb_core.h	usb: musb: core: Convert the musb_platform_reset to have a return value.	2014-07-16 09:59:58 -05:00
musb_cppi41.c	usb: musb: cppi41: tweak hrtimer values	2014-09-05 10:59:25 -05:00
musb_debug.h
musb_debugfs.c	usb: remove use of __devinit	2012-11-21 13:27:16 -08:00
musb_dma.h	usb: musb: introduce dma_channel.rx_packet_done	2014-06-30 14:26:24 -05:00
musb_dsps.c	usb: patches for v3.17 merge window	2014-07-21 11:33:41 -07:00
musb_gadget_ep0.c	usb: musb: gadget: read ep0 fifo only if rxcount is non zero	2013-04-02 11:42:50 +03:00
musb_gadget.c	usb: musb: fix setting JZ4740 gadget periphal mode on reset	2013-12-20 09:53:59 -06:00
musb_gadget.h	usb: musb: add Kconfig options for HOST, GAGDET or DUAL_ROLE modes	2013-05-28 19:22:23 +03:00
musb_host.c	usb: musb: fix wrong indentation in musb_host.c	2014-06-30 14:26:27 -05:00
musb_host.h	usb: musb: fix prototype for musb_port_reset	2013-12-20 15:05:43 -06:00
musb_io.h	usb: musb: use io{read,write}*_rep accessors	2012-12-17 17:15:13 -08:00
musb_regs.h	usb: musb: dsps: Add the sw_babble_control() and Enable for newer silicon	2014-07-16 10:00:02 -05:00
musb_virthub.c	usb: musb: correct use of schedule_delayed_work()	2014-02-20 09:17:24 -06:00
musbhsdma.c	usb: musb: dma: merge ->start/stop into create/destroy	2013-07-29 13:53:18 +03:00
musbhsdma.h	usb: musb: remove generic_interrupt	2012-11-06 15:32:13 +02:00
omap2430.c	usb: musb: omap2430: make sure clocks are enabled when running mailbox	2014-04-15 12:08:02 -05:00
omap2430.h	usb: start using the control module driver	2013-01-25 12:27:24 +02:00
tusb6010_omap.c	usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.	2014-05-16 12:16:31 -05:00
tusb6010.c	usb: musb: tusb6010: Introduce the use of the managed version of kzalloc	2014-06-30 12:26:49 -05:00
tusb6010.h	usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.	2014-05-16 12:16:31 -05:00
ux500_dma.c	usb: musb: ux500: fix decimal printf format specifiers prefixed with 0x	2014-08-19 09:24:45 -05:00
ux500.c	usb: patches for v3.17 merge window	2014-07-21 11:33:41 -07:00