aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
commit59e52534172d845ebffb0d7e85fc56fb7b857051 (patch)
tree49552e03f1bdb413cd8b5f7542e91770688d7047 /MAINTAINERS
parent73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff)
parent0d89e54c8249645404283436d952afc261a04e1e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits) MAINTAINERS: linux-m32r is moderated for non-subscribers linux@lists.openrisc.net is moderated for non-subscribers Drop default from "DM365 codec select" choice parisc: Kconfig: cleanup Kernel page size default Kconfig: remove redundant CONFIG_ prefix on two symbols cris: remove arch/cris/arch-v32/lib/nand_init.S microblaze: add missing CONFIG_ prefixes h8300: drop puzzling Kconfig dependencies MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers tty: drop superfluous dependency in Kconfig ARM: mxc: fix Kconfig typo 'i.MX51' Fix file references in Kconfig files aic7xxx: fix Kconfig references to READMEs Fix file references in drivers/ide/ thinkpad_acpi: Fix printk typo 'bluestooth' bcmring: drop commented out line in Kconfig btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888' doc: raw1394: Trivial typo fix CIFS: Don't free volume_info->UNC until we are entirely done with it. treewide: Correct spelling of successfully in comments ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 914b8bd318ce..5ccf370e052b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4072,7 +4072,7 @@ S: Maintained
4072 4072
4073M32R ARCHITECTURE 4073M32R ARCHITECTURE
4074M: Hirokazu Takata <takata@linux-m32r.org> 4074M: Hirokazu Takata <takata@linux-m32r.org>
4075L: linux-m32r@ml.linux-m32r.org 4075L: linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)
4076L: linux-m32r-ja@ml.linux-m32r.org (in Japanese) 4076L: linux-m32r-ja@ml.linux-m32r.org (in Japanese)
4077W: http://www.linux-m32r.org/ 4077W: http://www.linux-m32r.org/
4078S: Maintained 4078S: Maintained
@@ -4241,7 +4241,7 @@ F: include/mtd/
4241 4241
4242MICROBLAZE ARCHITECTURE 4242MICROBLAZE ARCHITECTURE
4243M: Michal Simek <monstr@monstr.eu> 4243M: Michal Simek <monstr@monstr.eu>
4244L: microblaze-uclinux@itee.uq.edu.au 4244L: microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)
4245W: http://www.monstr.eu/fdt/ 4245W: http://www.monstr.eu/fdt/
4246T: git git://git.monstr.eu/linux-2.6-microblaze.git 4246T: git git://git.monstr.eu/linux-2.6-microblaze.git
4247S: Supported 4247S: Supported
@@ -4745,7 +4745,7 @@ K: of_match_table
4745OPENRISC ARCHITECTURE 4745OPENRISC ARCHITECTURE
4746M: Jonas Bonn <jonas@southpole.se> 4746M: Jonas Bonn <jonas@southpole.se>
4747W: http://openrisc.net 4747W: http://openrisc.net
4748L: linux@lists.openrisc.net 4748L: linux@lists.openrisc.net (moderated for non-subscribers)
4749S: Maintained 4749S: Maintained
4750T: git git://openrisc.net/~jonas/linux 4750T: git git://openrisc.net/~jonas/linux
4751F: arch/openrisc 4751F: arch/openrisc