linux/arch/arm/mach-exynos4/include/mach
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* '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
2011-03-17 19:08:06 -07:00
..
debug-macro.S ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
dma.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
entry-macro.S ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
gpio.h ARM: EXYNOS4: Add missing GPYx banks 2011-03-15 21:17:43 +09:00
hardware.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
io.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
irqs.h ARM: EXYNOS4: Add support for gpio interrupts 2011-03-15 21:17:43 +09:00
map.h ARM: EXYNOS4: Update keypad base address 2011-03-15 20:37:02 +09:00
memory.h Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
pm-core.h ARM: EXYNOS4: Suspend to RAM Support 2011-03-12 10:18:24 +09:00
pwm-clock.h ARM: EXYNOS4: Update Timer part 2011-02-22 13:51:15 +09:00
regs-clock.h ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
regs-gpio.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
regs-irq.h ARM: EXYNOS4: Update IRQ part 2011-02-22 13:51:15 +09:00
regs-mct.h ARM: EXYNOS4: Implement kernel timers using MCT 2011-03-11 10:40:37 +09:00
regs-mem.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
regs-pmu.h ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
regs-sysmmu.h ARM: EXYNOS4: Enhancement of System MMU driver 2011-03-15 21:37:25 +09:00
smp.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
sysmmu.h ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
system.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
timex.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
uncompress.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
vmalloc.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00