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
  ...

diff --combined MAINTAINERS
index bd3f026dbe61e5e5cc23e904600afe578c8f9d62,7e9c040ce80fd19ea989e753f007bc0a99b08ab3..43761a00e3f19b8481ef6b921d514026c0b5b1a7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -439,7 -439,7 +439,7 @@@ F: drivers/hwmon/ams
  AMSO1100 RNIC DRIVER
  M:    Tom Tucker <[email protected]>
  M:    Steve Wise <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
@@@ -534,30 -534,10 +534,30 @@@ L:      [email protected]
  W:    http://maxim.org.za/at91_26.html
  S:    Maintained
  
 +ARM/BCMRING ARM ARCHITECTURE
 +M:    Leo Chen <[email protected]>
 +M:    Scott Branden <[email protected]>
 +L:    [email protected] (subscribers-only)
 +S:    Maintained
 +F:    arch/arm/mach-bcmring
 +
 +ARM/BCMRING MTD NAND DRIVER
 +M:    Leo Chen <[email protected]>
 +M:    Scott Branden <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/bcm_umi_nand.c
 +F:    drivers/mtd/nand/bcm_umi_bch.c
 +F:    drivers/mtd/nand/bcm_umi_hamming.c
 +F:    drivers/mtd/nand/nand_bcm_umi.h
 +
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 +M:    Hartley Sweeten <[email protected]>
 +M:    Ryan Mallon <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
 +F:    arch/arm/mach-ep93xx/
 +F:    arch/arm/mach-ep93xx/include/mach/
  
  ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -705,18 -685,6 +705,18 @@@ ARM/MAGICIAN MACHINE SUPPOR
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 +ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
 +M:    Lennert Buytenhek <[email protected]>
 +M:    Nicolas Pitre <[email protected]>
 +L:    [email protected] (subscribers-only)
 +T:    git git://git.marvell.com/orion
 +S:    Maintained
 +F:    arch/arm/mach-loki/
 +F:    arch/arm/mach-kirkwood/
 +F:    arch/arm/mach-mv78xx0/
 +F:    arch/arm/mach-orion5x/
 +F:    arch/arm/plat-orion/
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -908,7 -876,6 +908,7 @@@ M: "Luis R. Rodriguez" <lrodriguez@athe
  M:    Bob Copeland <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
  
@@@ -920,7 -887,6 +920,7 @@@ M: Vasanthakumar Thiagarajan <vasanth@a
  M:    Senthil Balasubramanian <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
@@@ -931,12 -897,6 +931,12 @@@ W:       http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/ath/ar9170/
  
 +ATK0110 HWMON DRIVER
 +M:    Luca Tettamanti <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/asus_atk0110.c
 +
  ATI_REMOTE2 DRIVER
  M:    Ville Syrjala <[email protected]>
  S:    Maintained
@@@ -1534,7 -1494,7 +1534,7 @@@ F:      drivers/net/cxgb3
  
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
  M:    Steve Wise <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  W:    http://www.openfabrics.org
  S:    Supported
  F:    drivers/infiniband/hw/cxgb3/
@@@ -1908,7 -1868,7 +1908,7 @@@ F:      fs/efs
  EHCA (IBM GX bus InfiniBand adapter) DRIVER
  M:    Hoang-Nam Nguyen <[email protected]>
  M:    Christoph Raisch <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Supported
  F:    drivers/infiniband/hw/ehca/
  
@@@ -1973,6 -1933,7 +1973,6 @@@ F:      fs/ext2
  F:    include/linux/ext2*
  
  EXT3 FILE SYSTEM
 -M:    Stephen Tweedie <[email protected]>
  M:    Andrew Morton <[email protected]>
  M:    Andreas Dilger <[email protected]>
  L:    [email protected]
@@@ -2157,16 -2118,13 +2157,16 @@@ F:   Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
 -FTRACE
 +TRACING
  M:    Steven Rostedt <[email protected]>
 +M:    Frederic Weisbecker <[email protected]>
 +M:    Ingo Molnar <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
  S:    Maintained
  F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
 -F:    include/*/ftrace.h
 +F:    include/*/ftrace.h include/trace/ include/linux/trace*.h
  F:    kernel/trace/
  
  FUJITSU FR-V (FRV) PORT
@@@ -2226,13 -2184,6 +2226,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    include/asm-generic
  
 +GENERIC UIO DRIVER FOR PCI DEVICES
 +M:    Michael S. Tsirkin <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/uio/uio_pci_generic.c
 +
  GFS2 FILE SYSTEM
  M:    Steven Whitehouse <[email protected]>
  L:    [email protected]
@@@ -2288,7 -2239,8 +2288,7 @@@ S:      Maintaine
  F:    drivers/media/video/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
 -P:    Brian Johnson
 -M:    [email protected]
 +M:    Brian Johnson <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -2601,7 -2553,7 +2601,7 @@@ INFINIBAND SUBSYSTE
  M:    Roland Dreier <[email protected]>
  M:    Sean Hefty <[email protected]>
  M:    Hal Rosenstock <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  W:    http://www.openib.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
@@@ -2709,21 -2661,25 +2709,21 @@@ F:   drivers/net/ixgbe
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
  M:    Zhu Yi <[email protected]>
 -M:    James Ketrenos <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2100.sourceforge.net
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/networking/README.ipw2100
  F:    drivers/net/wireless/ipw2x00/ipw2100.*
  
  INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
  M:    Zhu Yi <[email protected]>
 -M:    James Ketrenos <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2200.sourceforge.net
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
@@@ -2740,8 -2696,8 +2740,8 @@@ F:      include/linux/wimax/i2400m.
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Zhu Yi <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  W:    http://intellinuxwireless.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
  S:    Supported
@@@ -2774,7 -2730,7 +2774,7 @@@ F:      drivers/net/ipg.
  
  IPATH DRIVER
  M:    Ralph Campbell <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  T:    git git://git.qlogic.com/ipath-linux-2.6
  S:    Supported
  F:    drivers/infiniband/hw/ipath/
@@@ -2900,8 -2856,8 +2900,8 @@@ F:      fs/jffs2
  F:    include/linux/jffs2.h
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 -M:    Stephen Tweedie <[email protected]>
  M:    Andrew Morton <[email protected]>
 +M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    fs/jbd*/
@@@ -2973,7 -2929,6 +2973,7 @@@ F:      include/linux/sunrpc
  
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Avi Kivity <[email protected]>
 +M:    Marcelo Tosatti <[email protected]>
  L:    [email protected]
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3325,14 -3280,8 +3325,14 @@@ S:    Supporte
  F:    drivers/net/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
 +MARVELL MWL8K WIRELESS DRIVER
 +M:    Lennert Buytenhek <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/mwl8k.c
 +
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  
  MARVELL YUKON / SYSKONNECT DRIVER
@@@ -3537,7 -3486,7 +3537,7 @@@ F:      drivers/scsi/NCR_D700.
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <[email protected]>
  M:    Chien Tung <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  W:    http://www.neteffect.com
  S:    Supported
  F:    drivers/infiniband/hw/nes/
@@@ -3643,12 -3592,9 +3643,12 @@@ M:    "John W. Linville" <linville@tuxdriv
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
 +F:    net/mac80211/
 +F:    net/rfkill/
  F:    net/wireless/
  F:    include/net/ieee80211*
  F:    include/linux/wireless.h
 +F:    drivers/net/wireless/
  
  NETWORKING DRIVERS
  L:    [email protected]
@@@ -4024,14 -3970,6 +4024,14 @@@ S:    Maintaine
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  
 +PMC SIERRA MaxRAID DRIVER
 +P:    Anil Ravindranath
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://www.pmc-sierra.com/
 +S:    Supported
 +F:    drivers/scsi/pmcraid.*
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  S:    Supported
@@@ -4362,7 -4300,7 +4362,7 @@@ L:      [email protected]
  W:    http://linuxwireless.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
 -F:    drivers/net/wireless/rtl818*
 +F:    drivers/net/wireless/rtl818x/rtl8180*
  
  RTL8187 WIRELESS DRIVER
  M:    Herton Ronaldo Krzesinski <[email protected]>
@@@ -4454,6 -4392,14 +4454,14 @@@ S:    Maintaine
  F:    kernel/sched*
  F:    include/linux/sched.h
  
+ SCORE ARCHITECTURE
+ P:    Chen Liqin
+ M:    [email protected]
+ P:    Lennox Wu
+ M:    [email protected]
+ W:    http://www.sunplusct.com
+ S:    Supported
+ 
  SCSI CDROM DRIVER
  M:    Jens Axboe <[email protected]>
  L:    [email protected]
@@@ -4470,7 -4416,7 +4478,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 +M:    "James E.J. Bottomley" <James.Bottomley@suse.de>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@@ -4589,10 -4535,9 +4597,10 @@@ S:    Supporte
  F:    drivers/net/benet/
  
  SFC NETWORK DRIVER
 -P:    Steve Hodgson
 -P:    Ben Hutchings
 -M:    Robert Stonehouse <[email protected]>
 +M:    Solarflare linux maintainers <[email protected]>
 +M:    Steve Hodgson <[email protected]>
 +M:    Ben Hutchings <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/net/sfc/
  
@@@ -4653,12 -4598,6 +4661,12 @@@ F:    arch/arm/mach-s3c2410
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  
 +TI DAVINCI MACHINE SUPPORT
 +P:    Kevin Hilman
 +M:    [email protected]
 +S:    Supported
 +F:    arch/arm/mach-davinci
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -4710,7 -4649,7 +4718,7 @@@ F:      include/linux/sl?b*.
  F:    mm/sl?b.c
  
  SMC91x ETHERNET DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  F:    drivers/net/smc91x.*
  
@@@ -5648,24 -5587,6 +5656,24 @@@ M:    Miloslav Trmac <[email protected]
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 +WL1251 WIRELESS DRIVER
 +P:    Kalle Valo
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://wireless.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:    Maintained
 +F:    drivers/net/wireless/wl12xx/*
 +X:    drivers/net/wireless/wl12xx/wl1271*
 +
 +WL1271 WIRELESS DRIVER
 +M:    Luciano Coelho <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:    Maintained
 +F:    drivers/net/wireless/wl12xx/wl1271*
 +
  WL3501 WIRELESS PCMCIA CARD DRIVER
  M:    Arnaldo Carvalho de Melo <[email protected]>
  L:    [email protected]
@@@ -5683,26 -5604,6 +5691,26 @@@ S:    Supporte
  F:    drivers/input/touchscreen/*wm97*
  F:    include/linux/wm97xx.h
  
 +WOLFSON MICROELECTRONICS PMIC DRIVERS
 +P:    Mark Brown
 +M:    [email protected]
 +L:    [email protected]
 +T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 +W:    http://opensource.wolfsonmicro.com/node/8
 +S:    Supported
 +F:    drivers/leds/leds-wm83*.c
 +F:    drivers/mfd/wm8*.c
 +F:    drivers/power/wm83*.c
 +F:    drivers/rtc/rtc-wm83*.c
 +F:    drivers/regulator/wm8*.c
 +F:    drivers/video/backlight/wm83*_bl.c
 +F:    drivers/watchdog/wm83*_wdt.c
 +F:    include/linux/mfd/wm831x/
 +F:    include/linux/mfd/wm8350/
 +F:    include/linux/mfd/wm8400/
 +F:    sound/soc/codecs/wm8350.c
 +F:    sound/soc/codecs/wm8400.c
 +
  X.25 NETWORK LAYER
  M:    Henner Eisen <[email protected]>
  L:    [email protected]
@@@ -5735,7 -5636,7 +5743,7 @@@ F:      include/xen
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Felix Blyakher <felixb@sgi.com>
 +M:    Alex Elder <aelder@sgi.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://oss.sgi.com/projects/xfs