git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b93a4af 17ccb83)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:31:07 +0000 (23:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:31:07 +0000 (23:31 +0000)
Conflicts:
arch/arm/Kconfig

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history
drivers/serial/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
index 7ac8386,55764a1..ee74c3a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -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
diff --cc arch/arm/Makefile
Simple merge
diff --cc drivers/serial/Kconfig
Simple merge
Pandora Kernel Repository