Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Russell King [Tue, 2 Mar 2010 23:31:07 +0000 (23:31 +0000)]
Conflicts:
arch/arm/Kconfig

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
drivers/serial/Kconfig

diff --cc MAINTAINERS
Simple merge
@@@ -830,8 -827,8 +835,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
  source "arch/arm/mach-s3c6410/Kconfig"
  endif
  
 +source "arch/arm/mach-s5p6440/Kconfig"
 +
+ source "arch/arm/mach-shmobile/Kconfig"
  source "arch/arm/plat-stmp3xxx/Kconfig"
  
  if ARCH_S5PC1XX
Simple merge
Simple merge