]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a814290 b2a731a)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
Conflicts:
arch/arm/Makefile

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-s3c6410/mach-hmt.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
index bbcd512ccf7e07b4a17ca624d9a267fbb0d178c0,356d702c080867183f9dd9f9c16dd5826426354a..215a5cdd3d7f4840c3eafef9978acdc9cbcaeada
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -185,8 -185,6 +186,7 @@@ plat-$(CONFIG_PLAT_PXA)            := px
  plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c samsung
  plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c samsung
  plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx s3c samsung
- plat-$(CONFIG_ARCH_STMP3XXX)  := stmp3xxx
 +plat-$(CONFIG_PLAT_S5P)               := s5p samsung s3c
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.
diff --cc arch/arm/mach-s3c6410/mach-hmt.c
Simple merge
Clone of davem's net-next-2.6 tree