aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-11 11:15:31 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-11 11:15:31 -0400
commit93c6d8927fa692faef3d7d945bd4fe84b0185ad4 (patch)
tree0a971c86114656ec4e39f7789d9faeb70432c36a /MAINTAINERS
parentea01d31a07ae182028d2398380948f5a4ee09953 (diff)
parent50260924afd4b745bfb6e5f1caee381a1875fc31 (diff)
Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock
Shawn Guo <shawn.guo@linaro.org> writes: mxs common clk porting for v3.5. It depends on the following two branches. [1] git://git.linaro.org/people/mturquette/linux.git clk-next [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev As the mxs device tree conversion will constantly touch clock files, to save the conflicts, the updated mxs/dt branch coming later will based on this pull-request. * 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: remove now unused timer_clk argument from mxs_timer_init ARM: mxs: remove old clock support ARM: mxs: switch to common clk framework ARM: mxs: change the lookup name for fec phy clock ARM: mxs: request clock for timer clk: mxs: add clock support for imx28 clk: mxs: add clock support for imx23 clk: mxs: add mxs specific clocks Includes an update to Linux 3.4-rc6 Conflicts: drivers/clk/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 5 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 164e9a1df0f6..1baf9be3f8dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1978,10 +1978,7 @@ S: Maintained
1978F: drivers/net/ethernet/ti/cpmac.c 1978F: drivers/net/ethernet/ti/cpmac.c
1979 1979
1980CPU FREQUENCY DRIVERS 1980CPU FREQUENCY DRIVERS
1981M: Dave Jones <davej@redhat.com>
1982L: cpufreq@vger.kernel.org 1981L: cpufreq@vger.kernel.org
1983W: http://www.codemonkey.org.uk/projects/cpufreq/
1984T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
1985S: Maintained 1982S: Maintained
1986F: drivers/cpufreq/ 1983F: drivers/cpufreq/
1987F: include/linux/cpufreq.h 1984F: include/linux/cpufreq.h
@@ -3602,6 +3599,7 @@ S: Supported
3602F: drivers/net/wireless/iwlegacy/ 3599F: drivers/net/wireless/iwlegacy/
3603 3600
3604INTEL WIRELESS WIFI LINK (iwlwifi) 3601INTEL WIRELESS WIFI LINK (iwlwifi)
3602M: Johannes Berg <johannes.berg@intel.com>
3605M: Wey-Yi Guy <wey-yi.w.guy@intel.com> 3603M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
3606M: Intel Linux Wireless <ilw@linux.intel.com> 3604M: Intel Linux Wireless <ilw@linux.intel.com>
3607L: linux-wireless@vger.kernel.org 3605L: linux-wireless@vger.kernel.org
@@ -5901,11 +5899,11 @@ F: Documentation/scsi/st.txt
5901F: drivers/scsi/st* 5899F: drivers/scsi/st*
5902 5900
5903SCTP PROTOCOL 5901SCTP PROTOCOL
5904M: Vlad Yasevich <vladislav.yasevich@hp.com> 5902M: Vlad Yasevich <vyasevich@gmail.com>
5905M: Sridhar Samudrala <sri@us.ibm.com> 5903M: Sridhar Samudrala <sri@us.ibm.com>
5906L: linux-sctp@vger.kernel.org 5904L: linux-sctp@vger.kernel.org
5907W: http://lksctp.sourceforge.net 5905W: http://lksctp.sourceforge.net
5908S: Supported 5906S: Maintained
5909F: Documentation/networking/sctp.txt 5907F: Documentation/networking/sctp.txt
5910F: include/linux/sctp.h 5908F: include/linux/sctp.h
5911F: include/net/sctp/ 5909F: include/net/sctp/
@@ -7588,8 +7586,8 @@ F: Documentation/filesystems/xfs.txt
7588F: fs/xfs/ 7586F: fs/xfs/
7589 7587
7590XILINX AXI ETHERNET DRIVER 7588XILINX AXI ETHERNET DRIVER
7591M: Ariane Keller <ariane.keller@tik.ee.ethz.ch> 7589M: Anirudha Sarangi <anirudh@xilinx.com>
7592M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> 7590M: John Linn <John.Linn@xilinx.com>
7593S: Maintained 7591S: Maintained
7594F: drivers/net/ethernet/xilinx/xilinx_axienet* 7592F: drivers/net/ethernet/xilinx/xilinx_axienet*
7595 7593