Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 960d5a54aec3174052161ad4924b9cc0455e6202,ea3c858d7536785a670389ce536ae3da45f04c9c..5f6e34925a329ed10da0a59d498e218ea957562c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -524,8 -515,8 +524,9 @@@ config ARCH_DAVINC
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
 +      select ZONE_DMA
        help
          Support for TI's DaVinci platform.
  

diff --cc arch/arm/mach-davinci/board-evm.c
index 41f3cc4ac4afd73d726864b977530a990b30ba21,9581675f6586d6aa3d8a1d20f556ad2f2a8478f6..a957d239a6838f20458525a2710fa094073f674e
--- 1/arch/arm/mach-davinci/board-evm.c
--- 2/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
@@@ -16,11 -23,10 +23,10 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
 +#include <linux/io.h>
  
  #include <asm/setup.h>
 -#include <asm/io.h>
  #include <asm/mach-types.h>
- #include <mach/hardware.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

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

diff --cc arch/arm/mach-mx3/pcm037.c
Simple merge

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc drivers/video/atmel_lcdfb.c
Simple merge