summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 14:56:08 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-09 14:56:08 +0200
commit0a01216c452d092b16c5a559cca339ad60193457 (patch)
tree10a2dac7501ee889f5b0b1634abd16c81d3952d0 /MAINTAINERS
parent81211c4cc04ca33f7c3ae10de547113e34d9a59e (diff)
parente8094b2c17126c7dfdeafa296f206a4a3b122d23 (diff)
downloadlinux-3.10-0a01216c452d092b16c5a559cca339ad60193457.tar.gz
linux-3.10-0a01216c452d092b16c5a559cca339ad60193457.tar.bz2
linux-3.10-0a01216c452d092b16c5a559cca339ad60193457.zip
Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo <shawn.guo@linaro.org>: The imx fixes for 3.9, take 5: * A couple imx35 clock fixes for regressions caused by common clock framework conversion. The admux and iomux get disabled by common clock framework late initcall, and hence causes problems. * Add missing twd clock lookup in device tree. This becomes required since commit bd60345 (ARM: use device tree to get smp_twd clock) forces all DT boot to find lookup from device tree. * Fix imx6q ldb_di clock parents mismatch per reference manual. * tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6: (217 commits) ARM i.MX6: Fix ldb_di clock selection ARM: imx: provide twd clock lookup from device tree ARM: imx35 Bugfix admux clock ARM: clk-imx35: Bugfix iomux clock Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5829f9d520a..456c01c5dc6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5071,9 +5071,8 @@ S: Maintained
F: drivers/net/ethernet/marvell/sk*
MARVELL LIBERTAS WIRELESS DRIVER
-M: Dan Williams <dcbw@redhat.com>
L: libertas-dev@lists.infradead.org
-S: Maintained
+S: Orphan
F: drivers/net/wireless/libertas/
MARVELL MV643XX ETHERNET DRIVER
@@ -5575,6 +5574,7 @@ F: include/uapi/linux/if_*
F: include/uapi/linux/netdevice.h
NETXEN (1/10) GbE SUPPORT
+M: Manish Chopra <manish.chopra@qlogic.com>
M: Sony Chacko <sony.chacko@qlogic.com>
M: Rajesh Borundia <rajesh.borundia@qlogic.com>
L: netdev@vger.kernel.org