diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 10:35:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 10:35:30 +0200 |
| commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
| tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /MAINTAINERS | |
| parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| download | kernel-crypto-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.tar.gz kernel-crypto-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.tar.xz kernel-crypto-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.zip | |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9673cd28a69..c3b215970f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1544,7 +1544,6 @@ S: Maintained DVB SUBSYSTEM AND DRIVERS P: LinuxTV.org Project M: linux-media@vger.kernel.org -L: linux-dvb@linuxtv.org (subscription required) W: http://linuxtv.org/ T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git S: Maintained @@ -3245,6 +3244,13 @@ M: andi@lisas.de L: netdev@vger.kernel.org S: Maintained +NILFS2 FILESYSTEM +P: KONISHI Ryusuke +M: konishi.ryusuke@lab.ntt.co.jp +L: users@nilfs.org +W: http://www.nilfs.org/en/ +S: Supported + NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER P: YOKOTA Hiroshi M: yokota@netlab.is.tsukuba.ac.jp |