diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:45:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:45:08 -0400 |
commit | 81ce31b773226332475f89501b1072bec0c0e241 (patch) | |
tree | cd66f3c1caf731cc552ae90af2068aecabaed334 /MAINTAINERS | |
parent | 515b696b282f856c3ad1679ccd658120faa387d0 (diff) | |
parent | 9973affe9bbcde64041890d8793eb2e74143c298 (diff) |
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits)
score: add TIF_NOTIFY_RESUME define in asm/thread_info.h
score: make init_thread_union align to THREAD_SIZE
score: update files according to review comments.
score: add old syscall support
score: add MEMORY_START and MEMORY_SIZE define, to make the code clear
score: update inconsistent declare after .c was changed
score: remove unused code, add include files in .c
score: clean up mm/init.c
score: make irq.h definitions local
score: cleanups: dead code, 0 as pointer, shadowed variables
score: fix function prototypes
score: add address space annotations
score: add missing #includes
score: move save arg5 and arg6 instruction in front of enable_irq
score: add prototypes for wrapped syscalls
score: remove init_mm
score: add generic sys_call_table
score: remove __{put,get}_user_unknown
score: unset __ARCH_WANT_IPC_PARSE_VERSION
score: update files according to review comments
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd3f026dbe61..43761a00e3f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4454,6 +4454,14 @@ S: Maintained | |||
4454 | F: kernel/sched* | 4454 | F: kernel/sched* |
4455 | F: include/linux/sched.h | 4455 | F: include/linux/sched.h |
4456 | 4456 | ||
4457 | SCORE ARCHITECTURE | ||
4458 | P: Chen Liqin | ||
4459 | M: liqin.chen@sunplusct.com | ||
4460 | P: Lennox Wu | ||
4461 | M: lennox.wu@sunplusct.com | ||
4462 | W: http://www.sunplusct.com | ||
4463 | S: Supported | ||
4464 | |||
4457 | SCSI CDROM DRIVER | 4465 | SCSI CDROM DRIVER |
4458 | M: Jens Axboe <axboe@kernel.dk> | 4466 | M: Jens Axboe <axboe@kernel.dk> |
4459 | L: linux-scsi@vger.kernel.org | 4467 | L: linux-scsi@vger.kernel.org |