diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:27:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:27:21 -0700 |
| commit | e1f2084ed200eb31f2c9d1efe70569c76889c980 (patch) | |
| tree | 06b185bb7a13f4ac5862a8dbc05e8dd3453b27b8 /MAINTAINERS | |
| parent | e33ab8f275cf6e0e0bf6c9c44149de46222b36cc (diff) | |
| parent | 659e6ed55ff8d617c895c10288644e3e6107834e (diff) | |
| download | linux-e1f2084ed200eb31f2c9d1efe70569c76889c980.tar.gz linux-e1f2084ed200eb31f2c9d1efe70569c76889c980.tar.bz2 linux-e1f2084ed200eb31f2c9d1efe70569c76889c980.zip | |
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-- | MAINTAINERS | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eeecb504494c..8df8d2dfba28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -405,8 +405,8 @@ S: Maintained F: sound/oss/aedsp16.c AFFS FILE SYSTEM -M: Roman Zippel <zippel@linux-m68k.org> -S: Maintained +L: linux-fsdevel@vger.kernel.org +S: Orphan F: Documentation/filesystems/affs.txt F: fs/affs/ @@ -2946,8 +2946,8 @@ F: drivers/block/cciss* F: include/linux/cciss_ioctl.h HFS FILESYSTEM -M: Roman Zippel <zippel@linux-m68k.org> -S: Maintained +L: linux-fsdevel@vger.kernel.org +S: Orphan F: Documentation/filesystems/hfs.txt F: fs/hfs/ @@ -4001,7 +4001,6 @@ F: arch/m32r/ M68K ARCHITECTURE M: Geert Uytterhoeven <geert@linux-m68k.org> -M: Roman Zippel <zippel@linux-m68k.org> L: linux-m68k@lists.linux-m68k.org W: http://www.linux-m68k.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git |