aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 12:01:49 -0500
committerOlof Johansson <olof@lixom.net>2012-11-30 12:02:53 -0500
commit0c0029cb1806601430692d48c130a17302a18225 (patch)
tree2481cc582a77b3ce7651c3ab2478886941bea621 /MAINTAINERS
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff)
parent56580bb422e5f542da19c057f348dd39634138e7 (diff)
Merge tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper/linux into late/mvebu
From Jason Cooper. Unfortunately this is a combined branch with all mvebu code as one drop, something we normally try to avoid and instead slice vendor topics across our branches. Hopefully we can avoid doing this again for 3.9! mvebu everything for v3.8 - due to the complex interdependencies of the received pull requests I decided to keep this in one branch the way they recommended merging it - this was their first attempt at doing pull requests, we'll work on it with them - added SMP support for mvebu SoCs - added coherency fabric - added mdio and mvneta drivers - added mirabox board - added openblocks ax3-4 board - clock fixes and improvements - converted mv_xor driver to devicetree (extensive series in itself) * tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper/linux: (85 commits) dma: mv_xor: fix error handling path dma: mv_xor: fix error checking of irq_of_parse_and_map() dma: mv_xor: use request_irq() instead of devm_request_irq() dma: mv_xor: clear the window override control registers arm: mvebu: fix address decoding armada_cfg_base() function ARM: mvebu: update defconfig with I2C and RTC support ARM: mvebu: Add SATA support for OpenBlocks AX3-4 ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4 ARM: mvebu: Add support for I2C on OpenBlocks AX3-4 ARM: mvebu: Add support for I2C controllers in Armada 370/XP arm: mvebu: Add hardware I/O Coherency support arm: plat-orion: Add coherency attribute when setup mbus target arm: dma mapping: Export a dma ops function arm_dma_set_mask arm: mvebu: Add SMP support for Armada XP arm: mm: Add support for PJ4B cpu and init routines arm: mvebu: Add IPI support via doorbells arm: mvebu: Add initial support for power managmement service unit arm: mvebu: Add support for coherency fabric in mach-mvebu arm: mvebu: update defconfig to include XOR driver arm: mvebu: update defconfig to include network driver ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9386a63ea8f6..65e26d844a7e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4757,6 +4757,12 @@ S: Maintained
4757F: drivers/net/ethernet/marvell/mv643xx_eth.* 4757F: drivers/net/ethernet/marvell/mv643xx_eth.*
4758F: include/linux/mv643xx.h 4758F: include/linux/mv643xx.h
4759 4759
4760MARVELL MVNETA ETHERNET DRIVER
4761M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
4762L: netdev@vger.kernel.org
4763S: Maintained
4764F: drivers/net/ethernet/marvell/mvneta.*
4765
4760MARVELL MWIFIEX WIRELESS DRIVER 4766MARVELL MWIFIEX WIRELESS DRIVER
4761M: Bing Zhao <bzhao@marvell.com> 4767M: Bing Zhao <bzhao@marvell.com>
4762L: linux-wireless@vger.kernel.org 4768L: linux-wireless@vger.kernel.org