From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 25 Sep 2014 11:11:52 +0000 (+0200)
Subject: Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8;p=linux.git

Merge tag 'phy-for_3.18' of git://git./linux/kernel/git/kishon/linux-phy into usb-next

Kishon writes:

Adds 3 new PHY drivers stih407, stih41x and rcar gen2 PHY. It also
includes miscellaneous cleanup of other PHY drivers.

Conflicts:
	MAINTAINERS
---

346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8
diff --cc MAINTAINERS
index 51ecce8b785ab,a5cdbe94862c2..df0d0a8588264
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1392,15 -1392,14 +1392,17 @@@ S:	Maintaine
  F:	arch/arm/mach-sti/
  F:	arch/arm/boot/dts/sti*
  F:	drivers/clocksource/arm_global_timer.c
--F:	drivers/reset/sti/
--F:	drivers/pinctrl/pinctrl-st.c
--F:	drivers/media/rc/st_rc.c
  F:	drivers/i2c/busses/i2c-st.c
--F:	drivers/tty/serial/st-asc.c
++F:	drivers/media/rc/st_rc.c
  F:	drivers/mmc/host/sdhci-st.c
+ F:	drivers/phy/phy-stih407-usb.c
+ F:	drivers/phy/phy-stih41x-usb.c
++F:	drivers/pinctrl/pinctrl-st.c
++F:	drivers/reset/sti/
++F:	drivers/tty/serial/st-asc.c
 +F:	drivers/usb/dwc3/dwc3-st.c
 +F:	drivers/usb/host/ehci-st.c
 +F:	drivers/usb/host/ohci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:	Lennert Buytenhek <kernel@wantstofly.org>