Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

diff --combined MAINTAINERS
index 5ff7545ea94341250fa0b133224f671f03351f13,560ecce38ff526368879a635df4726b26c0eb6b6..f1bc3dc6b3699de3c072bfce91b3ec25417e41cb
--- 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>
@@@ -3520,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
@@@ -4283,7 -4292,10 +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
@@@ -5169,6 -5181,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/