projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7931d9 88d2704)
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
Conflicts:
arch/arm/Kconfig

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

diff --cc arch/arm/Kconfig
index 62152ae34758ddc9ffb1fb1eeb79fc75c00113fb,51a454bb40f99a74886992c418ae1667a0fa18f0..7d0818797c85c778135264003ba5737360fef662
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -758,8 -747,7 +758,9 @@@ source "arch/arm/mach-orion5x/Kconfig
  
  source "arch/arm/mach-kirkwood/Kconfig"
  
 +source "arch/arm/mach-dove/Kconfig"
 +
+ source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s3c64xx/Kconfig"
  source "arch/arm/plat-s3c/Kconfig"
diff --cc arch/arm/Makefile
Simple merge
John Crispins staging tree