1
0
Fork 0
alistair23-linux/arch/arm/mach-s5pv210/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: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma.h S5PV210: DMA: Add platform devices for PL330 DMACs 2010-05-18 18:00:13 +09:00
entry-macro.S ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
gpio.h ARM: S5PV210: Add more GPIO banks to gpiolib 2010-08-05 18:30:59 +09:00
hardware.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
io.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
irqs.h ARM: S5PV210: Add resource definitions for MIPI CSIS 2010-12-30 09:37:49 +09:00
map.h ARM: S5PV210: Cleanup map.h file 2011-02-17 12:52:52 +09:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
pm-core.h ARM: S5PV210: Add Power Management Support 2010-10-21 07:54:57 +09:00
pwm-clock.h ARM: S5PV210: Bug fix on PWM Timer 2010-05-11 09:32:40 +09:00
regs-clock.h ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
regs-fb.h ARM: S5PV210: Add temporary <mach/regs-fb.h> 2010-05-20 20:58:18 +09:00
regs-gpio.h ARM: S5P: Unify defines for both gpio interrupt types 2010-10-21 07:54:57 +09:00
regs-irq.h ARM: S5PV210: Add IRQ support 2010-02-24 22:47:22 +00:00
regs-sys.h ARM: S5PV210: Enable USB HSOTG gadget build 2010-10-21 07:54:56 +09:00
spi-clocks.h ARM: S5PV210: Define SPI platform devices 2010-05-20 19:31:10 +09:00
system.h ARM: S5P: Add Support common arch_reset() for S5P 2010-08-05 18:30:22 +09:00
tick.h ARM: S5PV210: Add clock support for S5PV210 2010-02-24 22:47:22 +00:00
timex.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
uncompress.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00