Merge branch 'imx' into devel

Conflicts:

	arch/arm/mm/Kconfig

diff --cc arch/arm/Kconfig
index b92925c,8a9a84c..3d9397e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -381,27 -365,13 +381,31 @@@ config ARCH_NS9XX
  
          <http://www.digi.com/products/microprocessors/index.jsp>
  
 +config ARCH_LOKI
 +      bool "Marvell Loki (88RC8480)"
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      select PLAT_ORION
 +      help
 +        Support for the Marvell Loki (88RC8480) SoC.
 +
 +config ARCH_MV78XX0
 +      bool "Marvell MV78xx0"
 +      select PCI
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      select PLAT_ORION
 +      help
 +        Support for the following Marvell MV78xx0 series SoCs:
 +        MV781x0, MV782x0.
 +
  config ARCH_MXC
        bool "Freescale MXC/iMX-based"
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
        select ARCH_MTD_XIP
+       select GENERIC_GPIO
+       select HAVE_GPIO_LIB
        help
          Support for Freescale MXC/iMX-based family of processors
  

diff --cc arch/arm/Makefile
index 91fac81,009d4fe..b20995a
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -133,9 -135,9 +133,10 @@@ endi
   machine-$(CONFIG_ARCH_NETX)     := netx
   machine-$(CONFIG_ARCH_NS9XXX)           := ns9xxx
   machine-$(CONFIG_ARCH_DAVINCI)          := davinci
 + machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood
   machine-$(CONFIG_ARCH_KS8695)     := ks8695
    incdir-$(CONFIG_ARCH_MXC)      := mxc
+  machine-$(CONFIG_ARCH_MX2)      := mx2
   machine-$(CONFIG_ARCH_MX3)      := mx3
   machine-$(CONFIG_ARCH_ORION5X)          := orion5x
   machine-$(CONFIG_ARCH_MSM7X00A)   := msm

diff --cc arch/arm/mm/Kconfig
index a2c8b00,68ea247..3a6c8ec
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -180,8 -180,8 +180,21 @@@ config CPU_ARM925
  # ARM926T
  config CPU_ARM926T
        bool "Support ARM926T processor"
-       depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
-       default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
 -      depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
 -      default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
++      depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \
++              MACH_VERSATILE_AB || ARCH_OMAP730 || \
++              ARCH_OMAP16XX || MACH_REALVIEW_EB || \
++              ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
++              ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
++              ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
++              ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
++              ARCH_NS9XXX || ARCH_DAVINCI
++      default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
++              ARCH_OMAP730 || ARCH_OMAP16XX || \
++              ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
++              ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
++              ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
++              ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
++              ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
        select CPU_32v5
        select CPU_ABRT_EV5TJ
        select CPU_PABRT_NOIFAR

diff --cc drivers/mmc/host/imxmmc.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc drivers/spi/spi_imx.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge