Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits)
  Revert "rtc: omap: let device wakeup capability be configured from chip init logic"
  DM365: Added more PINMUX configurations for AEMIF
  DM365: Make CLKOUTx available
  DM365: Added PINMUX definitions for GPIO30..32
  Davinci: iotable based ioremap() interception
  Davinci: pinmux - use ioremap()
  Davinci: aintc/cpintc - use ioremap()
  Davinci: psc - use ioremap()
  Davinci: timer - use ioremap()
  Davinci: jtag_id - use ioremap()
  Davinci: da8xx: rtc - use ioremap
  Davinci: gpio - use ioremap()
  davinci: edma: fix coding style issue related to breaking lines
  davinci: edma: use BIT() wherever possible
  davinci: edma: fix coding style issue related to usage of braces
  davinci: edma: use a more intuitive name for edma_info
  Davinci: serial - conditional reset via pwremu
  Davinci: serial - use ioremap()
  Davinci: serial - remove unnecessary define
  Davinci: watchdog reset separation across socs
  ...

Fix up trivial conflict in arch/arm/Kconfig due to removal of "select
GENERIC_TIME"

diff --cc arch/arm/Kconfig
index a07b6c47a6b80453d0fa2bb2df74f6374399df29,1151d1afd756e5534f398256e3827e6c079b6ed6..2d70cece2ea2f390856d84c8c4515310082e9e2a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -760,9 -776,11 +760,8 @@@ config ARCH_NOMADI
  
  config ARCH_DAVINCI
        bool "TI DaVinci"
-       select CPU_ARM926T
 -      select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
 -      select HAVE_CLK
        select ZONE_DMA
        select HAVE_IDE
        select COMMON_CLKDEV

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