From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Thu, 21 Oct 2010 18:21:55 +0000 (-0700)
Subject: Merge branch 'davinci-next' into davinci-for-linus
X-Git-Tag: v3.0~3027^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7940a34b2e1e0485211a17d8c3ab4da1ea3e1330;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'davinci-next' into davinci-for-linus

Conflicts:
	arch/arm/mach-davinci/board-da830-evm.c
	arch/arm/mach-davinci/board-da850-evm.c
---

7940a34b2e1e0485211a17d8c3ab4da1ea3e1330
diff --cc arch/arm/mach-davinci/board-da830-evm.c
index 7f3cdbf,1bb89d3..b52a3a1
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@@ -596,7 -608,9 +608,7 @@@ static void __init da830_evm_map_io(voi
  	da830_init();
  }
  
- MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137 EVM")
+ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
 -	.phys_io	= IO_PHYS,
 -	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
  	.boot_params	= (DA8XX_DDR_BASE + 0x100),
  	.map_io		= da830_evm_map_io,
  	.init_irq	= cp_intc_init,
diff --cc arch/arm/mach-davinci/board-da850-evm.c
index b26f5cb,ef97c7f..c6e11c6
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -816,7 -868,9 +868,7 @@@ static void __init da850_evm_map_io(voi
  	da850_init();
  }
  
- MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138 EVM")
+ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
 -	.phys_io	= IO_PHYS,
 -	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
  	.boot_params	= (DA8XX_DDR_BASE + 0x100),
  	.map_io		= da850_evm_map_io,
  	.init_irq	= cp_intc_init,