diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:52:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:52:24 +1100 |
| commit | 5d379900c79da8890a1003baf6525a7f56e667cc (patch) | |
| tree | 990c35909ebc0275387740a8ddd8d9e43bcb09ae /MAINTAINERS | |
| parent | 3e7f74cd52ee9aa776de0100cee988f600490ba1 (diff) | |
| parent | 7d49f0bac41ee9b012af1efe2f725d91a87a8fe9 (diff) | |
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
arch/arm/boot/dts/omap3-evm.dts
drivers/Kconfig
drivers/usb/musb/davinci.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ef6d4c77248a..b527cca00259 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3716,6 +3716,14 @@ S: Maintained F: include/asm-generic/ F: include/uapi/asm-generic/ +GENERIC PHY FRAMEWORK +M: Kishon Vijay Abraham I <kishon@ti.com> +L: linux-kernel@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git +S: Supported +F: drivers/phy/ +F: include/linux/phy/ + GENERIC UIO DRIVER FOR PCI DEVICES M: "Michael S. Tsirkin" <mst@redhat.com> L: kvm@vger.kernel.org |