Merge branch 'score' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generi...

* '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

diff --cc MAINTAINERS
index 60299a9,ef643dd..7e9c040
--- 1/MAINTAINERS
--- 2/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 <axboe@kernel.dk>
  L:    linux-scsi@vger.kernel.org
  W:    http://www.kernel.dk
  S:    Maintained