aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:27:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 19:27:21 -0400
commite1f2084ed200eb31f2c9d1efe70569c76889c980 (patch)
tree06b185bb7a13f4ac5862a8dbc05e8dd3453b27b8 /MAINTAINERS
parente33ab8f275cf6e0e0bf6c9c44149de46222b36cc (diff)
parent659e6ed55ff8d617c895c10288644e3e6107834e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: input/atari: Fix mouse movement and button mapping input/atari: Fix atarimouse init input/atari: Use the correct mouse interrupt hook m68k/atari: Do not use "/" in interrupt names m68k: unistd - Comment out definitions for unimplemented syscalls m68k: Really wire up sys_pselect6 and sys_ppoll m68k: Merge mmu and non-mmu versions of sys_call_table MAINTAINERS: Roman Zippel has been MIA for several years. m68k: bitops - Never step beyond the end of the bitmap m68k: bitops - offset == ((long)p - (long)vaddr) * 8
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eeecb504494..8df8d2dfba2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -405,8 +405,8 @@ S: Maintained
405F: sound/oss/aedsp16.c 405F: sound/oss/aedsp16.c
406 406
407AFFS FILE SYSTEM 407AFFS FILE SYSTEM
408M: Roman Zippel <zippel@linux-m68k.org> 408L: linux-fsdevel@vger.kernel.org
409S: Maintained 409S: Orphan
410F: Documentation/filesystems/affs.txt 410F: Documentation/filesystems/affs.txt
411F: fs/affs/ 411F: fs/affs/
412 412
@@ -2946,8 +2946,8 @@ F: drivers/block/cciss*
2946F: include/linux/cciss_ioctl.h 2946F: include/linux/cciss_ioctl.h
2947 2947
2948HFS FILESYSTEM 2948HFS FILESYSTEM
2949M: Roman Zippel <zippel@linux-m68k.org> 2949L: linux-fsdevel@vger.kernel.org
2950S: Maintained 2950S: Orphan
2951F: Documentation/filesystems/hfs.txt 2951F: Documentation/filesystems/hfs.txt
2952F: fs/hfs/ 2952F: fs/hfs/
2953 2953
@@ -4001,7 +4001,6 @@ F: arch/m32r/
4001 4001
4002M68K ARCHITECTURE 4002M68K ARCHITECTURE
4003M: Geert Uytterhoeven <geert@linux-m68k.org> 4003M: Geert Uytterhoeven <geert@linux-m68k.org>
4004M: Roman Zippel <zippel@linux-m68k.org>
4005L: linux-m68k@lists.linux-m68k.org 4004L: linux-m68k@lists.linux-m68k.org
4006W: http://www.linux-m68k.org/ 4005W: http://www.linux-m68k.org/
4007T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git 4006T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git