Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined MAINTAINERS
index 195eb199f1fd29ed2131835fb8beb9754792d52a,f1bc3dc6b3699de3c072bfce91b3ec25417e41cb..338629e2224dd67fb32d21ba0adbdc4302db8a1f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1010,6 -1010,15 +1010,15 @@@ L:    linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    arch/arm/mach-s5p*/
  
+ ARM/SAMSUNG MOBILE MACHINE SUPPORT
+ M:    Kyungmin Park <kyungmin.park@samsung.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-s5pv210/mach-aquila.c
+ F:    arch/arm/mach-s5pv210/mach-goni.c
+ F:    arch/arm/mach-exynos4/mach-universal_c210.c
+ F:    arch/arm/mach-exynos4/mach-nuri.c
+ 
  ARM/SAMSUNG S5P SERIES FIMC SUPPORT
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  M:    Sylwester Nawrocki <s.nawrocki@samsung.com>
@@@ -1467,6 -1476,7 +1476,7 @@@ F:      include/net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <fubar@us.ibm.com>
+ M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -1692,6 -1702,13 +1702,13 @@@ M:    Andy Whitcroft <apw@canonical.com
  S:    Supported
  F:    scripts/checkpatch.pl
  
+ CHINESE DOCUMENTATION
+ M:    Harry Wei <harryxiyou@gmail.com>
+ L:    xiyoulinuxkernelgroup@googlegroups.com
+ L:    linux-kernel@zh-kernel.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/zh_CN/
+ 
  CISCO VIC ETHERNET NIC DRIVER
  M:    Vasanthy Kolluri <vkolluri@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
@@@ -2026,7 -2043,7 +2043,7 @@@ F:      Documentation/scsi/dc395x.tx
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
- M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+ M:    Gerrit Renker <gerrit@erg.abdn.ac.uk>
  L:    dccp@vger.kernel.org
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  S:    Maintained
@@@ -3512,7 -3529,7 +3529,7 @@@ F:      drivers/hwmon/jc42.
  F:    Documentation/hwmon/jc42
  
  JFS FILESYSTEM
- M:    Dave Kleikamp <shaggy@linux.vnet.ibm.com>
+ M:    Dave Kleikamp <shaggy@kernel.org>
  L:    jfs-discussion@lists.sourceforge.net
  W:    http://jfs.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
@@@ -4275,10 -4292,7 +4292,7 @@@ S:     Maintaine
  F:    net/sched/sch_netem.c
  
  NETERION 10GbE DRIVERS (s2io/vxge)
- M:    Ramkrishna Vepa <ramkrishna.vepa@exar.com>
- M:    Sivakumar Subramani <sivakumar.subramani@exar.com>
- M:    Sreenivasa Honnur <sreenivasa.honnur@exar.com>
- M:    Jon Mason <jon.mason@exar.com>
+ M:    Jon Mason <jdmason@kudzu.us>
  L:    netdev@vger.kernel.org
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@@ -5164,6 -5178,7 +5178,7 @@@ F:      drivers/char/random.
  
  RAPIDIO SUBSYSTEM
  M:    Matt Porter <mporter@kernel.crashing.org>
+ M:    Alexandre Bounine <alexandre.bounine@idt.com>
  S:    Maintained
  F:    drivers/rapidio/
  
@@@ -5266,7 -5281,7 +5281,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
- M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  M:    Hin-Tak Leung <htl10@users.sourceforge.net>
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  L:    linux-wireless@vger.kernel.org
@@@ -6082,7 -6097,6 +6097,7 @@@ S:      Supporte
  F:    arch/tile/
  F:    drivers/char/hvc_tile.c
  F:    drivers/net/tile/
 +F:    drivers/edac/tile_edac.c
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <chessman@tux.org>
@@@ -6105,7 -6119,7 +6120,7 @@@ S:      Maintaine
  F:    security/tomoyo/
  
  TOPSTAR LAPTOP EXTRAS DRIVER
- M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c