From: Chen Liqin Date: Sun, 30 Aug 2009 02:26:23 +0000 (+0800) Subject: Merge branch 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generi... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=d27eadc7612404b06f99888c02726ab7d5036e0f;p=linux-edison.git Merge branch 'score' of git://git./linux/kernel/git/arnd/asm-generic into for-linus * 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: 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 score: add maintainers for score architecture score: Add support for Sunplus S+core architecture --- d27eadc7612404b06f99888c02726ab7d5036e0f diff --cc MAINTAINERS index 60299a9a7ad,ef643ddd5e8..7e9c040ce80 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4392,8 -5000,17 +4392,16 @@@ S: Maintaine F: kernel/sched* F: include/linux/sched.h + SCORE ARCHITECTURE + P: Chen Liqin + M: liqin.chen@sunplusct.com + P: Lennox Wu + M: lennox.wu@sunplusct.com + W: http://www.sunplusct.com + S: Supported + SCSI CDROM DRIVER -P: Jens Axboe -M: axboe@kernel.dk +M: Jens Axboe L: linux-scsi@vger.kernel.org W: http://www.kernel.dk S: Maintained