Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2014 11:11:52 +0000 (13:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2014 11:11:52 +0000 (13:11 +0200)
Kishon writes:

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

Conflicts:
MAINTAINERS


Trivial merge