• Olof Johansson's avatar
    Merge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc · 42279616
    Olof Johansson authored
    From Shawn Guo:
    imx6q cpuidle support for 3.9
    
     - It's based on imx-cleanup-3.9 to avoid conflicts.
    
    * tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
      ARM: imx6q: support WAIT mode using cpuidle
      ARM: imx: move imx6q_cpuidle_driver into a separate file
      ARM: imx: mask gpc interrupts initially
      ARM: imx: return zero in case next event gets a large increment
      ARM: imx: Remove mx508 support
      ARM: imx: Remove mach-mx51_3ds board
      ARM: imx: use debug_ll_io_init() for imx6q
      ARM: imx: remove unused imx6q_clock_map_io()
      ARM: mach-imx: Kconfig: Do not select Babbage for MACH_IMX51_DT
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Still, two delete/change conflicts caused by imx/cleanup:
    
    	arch/arm/mach-imx/mach-mx50_rdp.c
    	arch/arm/mach-imx/mach-mx51_3ds.c
    42279616
gpc.c 2.67 KB