• Linus Torvalds's avatar
    Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm · 411f5c7a
    Linus Torvalds authored
    * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
      davinci: DM644x EVM: register MUSB device earlier
      davinci: add spi devices on tnetv107x evm
      davinci: add ssp config for tnetv107x evm board
      davinci: add tnetv107x ssp platform device
      spi: add ti-ssp spi master driver
      mfd: add driver for sequencer serial port
      ARM: EXYNOS4: Implement Clock gating for System MMU
      ARM: EXYNOS4: Enhancement of System MMU driver
      ARM: EXYNOS4: Add support for gpio interrupts
      ARM: S5P: Add function to register gpio interrupt bank data
      ARM: S5P: Cleanup S5P gpio interrupt code
      ARM: EXYNOS4: Add missing GPYx banks
      ARM: S3C64XX: Fix section mismatch from cpufreq init
      ARM: EXYNOS4: Add keypad device to the SMDKV310
      ARM: EXYNOS4: Update clocks for keypad
      ARM: EXYNOS4: Update keypad base address
      ARM: EXYNOS4: Add keypad device helpers
      ARM: EXYNOS4: Add support for SATA on ARMLEX4210
      plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
      mach-u300: define a dummy filter function for coh901318
      ...
    
    Fix up various conflicts in
     - arch/arm/mach-exynos4/cpufreq.c
     - arch/arm/mach-mxs/gpio.c
     - drivers/net/Kconfig
     - drivers/tty/serial/Kconfig
     - drivers/tty/serial/Makefile
     - drivers/usb/gadget/fsl_mxc_udc.c
     - drivers/video/Kconfig
    411f5c7a
gpio.c 9.39 KB