forked from Minki/linux
4cd41ffd27
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUFjfVAAoJEHm+PkMAQRiGANkIAIU3PNrAz9dIItq8a/rEAhnx l2shHoOyEmyNR2apholM3BPUNX50cbsc/HGdi7lZKLkA/ifAj6B9nFD2NzVsIChD 1QWVcvdkKlVuxXCDd26qbijlfmbTOAWrLw9ntvM+J6ZtECM6zCAZF4MAV/FwogPq ETGKD76AxJtVIhBMS99troAiC1YxmQ7DKgEr8CraTOR1qwXEonnPCmN/IZA6x2/G EXiihOuQB5me1X7k4PI0V8CDscQOn+3B2CQHIrjRB+KiTF+iKIuI8n6ORC6bpFh+ U8UZP9wLlIG1BrUHG83pIndglIHotqPcjmtfl1WGrRr2hn7abzVSfV+g5Syo3Vg= =Ep+s -----END PGP SIGNATURE----- Merge tag 'v3.17-rc5' into next Linux 3.17-rc5 Signed-off-by: Felipe Balbi <balbi@ti.com> Conflicts: Documentation/devicetree/bindings/usb/mxs-phy.txt drivers/usb/phy/phy-mxs-usb.c |
||
---|---|---|
.. | ||
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 |