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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-davinci/board-da830-evm.c
index 7f3cdbfc0fbb5229f25b360f4477f28968991cf3,1bb89d3f9b1fb4062c5a95d2f2e43022b3be42bb..b52a3a1abd945745bf7e251062f7d4b6447f99ab
--- 1/arch/arm/mach-davinci/board-da830-evm.c
--- 2/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 b26f5cbfce3e2f5f1d8b4e8ee47a5e138e1a2999,ef97c7f76de54de5d232b57546c7a2453b7df0fe..c6e11c682e4c31261abb6a0a6c1cb5141b3f60d8
--- 1/arch/arm/mach-davinci/board-da850-evm.c
--- 2/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,

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
Simple merge

diff --cc arch/arm/mach-davinci/board-sffsdr.c
Simple merge

diff --cc arch/arm/mach-davinci/board-tnetv107x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/dm365.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge

diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/net/Kconfig
Simple merge