summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:41:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:41:09 -0800
commit1e8c573933fd7975679766850252ad08667e5ca4 (patch)
tree9600d0c7ee5ea8925f3c4dc30680c819e0363805 /MAINTAINERS
parentd71eecf3b8e893757cc3dec560c96a32ac090890 (diff)
parent232443e2c90cc2930624dec89df327615b002c55 (diff)
downloadop-kernel-dev-1e8c573933fd7975679766850252ad08667e5ca4.zip
op-kernel-dev-1e8c573933fd7975679766850252ad08667e5ca4.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits) BUG_ON() Conversion in drivers/video/ BUG_ON() Conversion in drivers/parisc/ BUG_ON() Conversion in drivers/block/ BUG_ON() Conversion in sound/sparc/cs4231.c BUG_ON() Conversion in drivers/s390/block/dasd.c BUG_ON() Conversion in lib/swiotlb.c BUG_ON() Conversion in kernel/cpu.c BUG_ON() Conversion in ipc/msg.c BUG_ON() Conversion in block/elevator.c BUG_ON() Conversion in fs/coda/ BUG_ON() Conversion in fs/binfmt_elf_fdpic.c BUG_ON() Conversion in input/serio/hil_mlc.c BUG_ON() Conversion in md/dm-hw-handler.c BUG_ON() Conversion in md/bitmap.c The comment describing how MS_ASYNC works in msync.c is confusing rcu: undeclared variable used in documentation fix typos "wich" -> "which" typo patch for fs/ufs/super.c Fix simple typos tabify drivers/char/Makefile ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fa92d0d..4e8fbbc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2025,12 +2025,6 @@ L: parisc-linux@parisc-linux.org
W: http://www.parisc-linux.org/
S: Maintained
-PERSONALITY HANDLING
-P: Christoph Hellwig
-M: hch@infradead.org
-L: linux-abi-devel@lists.sourceforge.net
-S: Maintained
-
PCI ERROR RECOVERY
P: Linas Vepstas
M: linas@austin.ibm.com
@@ -2081,6 +2075,12 @@ M: tsbogend@alpha.franken.de
L: netdev@vger.kernel.org
S: Maintained
+PERSONALITY HANDLING
+P: Christoph Hellwig
+M: hch@infradead.org
+L: linux-abi-devel@lists.sourceforge.net
+S: Maintained
+
PHRAM MTD DRIVER
P: Jörn Engel
M: joern@wh.fh-wedel.de
OpenPOWER on IntegriCloud