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-Tag: fixes-for-v3.18-merge-window~16^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8;p=pandora-kernel.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
Reading git-diff-tree failed