Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon...

Kishon writes:

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

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 51ecce8,a5cdbe9..df0d0a8
--- 1/MAINTAINERS
--- 2/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>