1
linux/arch/arm/mach-s3c2440
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
..
include/mach ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02 2011-03-04 15:46:26 +09:00
clock.c
dma.c ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed 2010-02-21 23:10:35 +00:00
dsc.c ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 2010-02-01 17:56:46 +00:00
irq.c ARM: S3C24XX: irq_data conversion 2011-01-03 19:15:54 +09:00
Kconfig ARM: S3C2440: Select missing S3C_DEV_USB_HOST on GTA02 2011-03-04 15:46:26 +09:00
mach-anubis.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-at2440evb.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-gta02.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-mini2440.c ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation 2011-03-07 12:23:22 -08:00
mach-nexcoder.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-osiris-dvs.c
mach-osiris.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-rx1950.c ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation 2011-03-07 12:23:22 -08:00
mach-rx3715.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smdk2440.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
Makefile ARM: S3C2440: Add HP iPAQ RX1950 machine support 2010-05-12 09:19:01 +09:00
s3c244x-clock.c ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 2010-02-01 17:56:04 +00:00
s3c244x-irq.c ARM: S3C24XX: irq_data conversion 2011-01-03 19:15:54 +09:00
s3c244x.c ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
s3c2440-cpufreq.c ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. 2010-03-15 22:43:12 +00:00
s3c2440-pll-12000000.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440-pll-16934400.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440.c ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks 2010-12-08 01:04:56 +00:00
s3c2442.c ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks 2010-12-08 01:04:56 +00:00