diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 13:14:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 13:14:26 +0900 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /MAINTAINERS | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.gz linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.bz2 linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9a5537b4e4a0..25b4159fa132 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -970,6 +970,18 @@ M: Wan ZongShun <mcuos.com@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.mcuos.com S: Maintained +F: arch/arm/mach-w90x900/ +F: arch/arm/mach-nuc93x/ +F: drivers/input/keyboard/w90p910_keypad.c +F: drivers/input/touchscreen/w90p910_ts.c +F: drivers/watchdog/nuc900_wdt.c +F: drivers/net/arm/w90p910_ether.c +F: drivers/mtd/nand/w90p910_nand.c +F: drivers/rtc/rtc-nuc900.c +F: drivers/spi/spi_nuc900.c +F: drivers/usb/host/ehci-w90x900.c +F: drivers/video/nuc900fb.c +F: drivers/sound/soc/nuc900/ ARM/U300 MACHINE SUPPORT M: Linus Walleij <linus.walleij@stericsson.com> @@ -2876,6 +2888,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git S: Maintained F: drivers/input/ +INTEL IDLE DRIVER +M: Len Brown <lenb@kernel.org> +L: linux-pm@lists.linux-foundation.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git +S: Supported +F: drivers/idle/intel_idle.c + INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) M: Maik Broemme <mbroemme@plusserver.de> L: linux-fbdev@vger.kernel.org @@ -4825,6 +4844,9 @@ W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: arch/s390/ F: drivers/s390/ +F: fs/partitions/ibm.c +F: Documentation/s390/ +F: Documentation/DocBook/s390* S390 NETWORK DRIVERS M: Ursula Braun <ursula.braun@de.ibm.com> @@ -4993,6 +5015,12 @@ L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-s3c.c +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER +M: Viresh Kumar <viresh.kumar@st.com> +L: linux-mmc@vger.kernel.org +S: Maintained +F: drivers/mmc/host/sdhci-spear.c + SECURITY SUBSYSTEM M: James Morris <jmorris@namei.org> L: linux-security-module@vger.kernel.org (suggested Cc:) |