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 |
||
---|---|---|
.. | ||
am35x-phy-control.h | ||
Kconfig | ||
Makefile | ||
of.c | ||
phy-ab8500-usb.c | ||
phy-am335x-control.c | ||
phy-am335x.c | ||
phy-fsl-usb.c | ||
phy-fsl-usb.h | ||
phy-generic.c | ||
phy-generic.h | ||
phy-gpio-vbus-usb.c | ||
phy-isp1301-omap.c | ||
phy-isp1301.c | ||
phy-keystone.c | ||
phy-msm-usb.c | ||
phy-mv-usb.c | ||
phy-mv-usb.h | ||
phy-mxs-usb.c | ||
phy-omap-otg.c | ||
phy-rcar-gen2-usb.c | ||
phy-rcar-usb.c | ||
phy-tahvo.c | ||
phy-tegra-usb.c | ||
phy-twl6030-usb.c | ||
phy-ulpi-viewport.c | ||
phy-ulpi.c | ||
phy.c |