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)
commit346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8
tree0e824d68b72969127abcad85e82b468ed4e23237
parent5caf6ae5ce880ec15448b310e47a9515ebb7e808
parent4f0eb5d7efe375859b15c97f453113a242bf057b
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
MAINTAINERS