linux/arch/arm/mach-s5pc100
Linus Torvalds 636d17427b Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
  ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
  ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
  ARM: 6322/1: imx/pca100: Fix name of spi platform data
  ARM: 6321/1: fix syntax error in main Kconfig file
  ARM: 6297/1: move U300 timer to dynamic clock lookup
  ARM: 6296/1: clock U300 intcon and timer properly
  ARM: 6295/1: fix U300 apb_pclk split
  ARM: 6306/1: fix inverted MMC card detect in U300
  ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
  ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
  ARM: 6292/1: coresight: add ETM management registers
  ARM: 6288/1: ftrace: document mcount formats
  ARM: 6287/1: ftrace: clean up mcount assembly indentation
  ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
  ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
  ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
  ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
  ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
  ARM: S5PV210: Override FIMC driver name on Aquila board
  ARM: S5PC100: enable FIMC on SMDKC100
  ...

Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
different subsystem 'setname' calls, and trivial port types in
include/linux/serial_core.h
2010-08-11 09:13:19 -07:00
..
include/mach Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
clock.c ARM: S5PC100: cleanup hsmmc clock definitions 2010-08-05 18:30:51 +09:00
cpu.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
dev-audio.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
dev-spi.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
dma.c ARM: S5PC100: Fixup merge problems 2010-05-23 16:27:04 +01:00
gpiolib.c ARM: S5PC100: use common plat-s5p external interrupt code 2010-05-20 15:28:44 +09:00
init.c ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
irq-gpio.c ARM: S5PC100: Add support for gpio interrupt 2010-05-20 15:28:43 +09:00
Kconfig ARM: S5PC100: enable FIMC on SMDKC100 2010-08-09 16:55:35 +09:00
mach-smdkc100.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
Makefile ARM: S5PC100: Add keypad device to the SMDKC100 board 2010-08-05 18:30:51 +09:00
Makefile.boot ARM: S5PC100: Kconfigs and Makefiles 2009-08-16 23:35:19 +01:00
setup-fb-24bpp.c ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100 2010-05-19 18:23:27 +09:00
setup-i2c0.c ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 2010-05-19 18:23:37 +09:00
setup-i2c1.c ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 2010-05-19 18:23:37 +09:00
setup-ide.c ARM: S5PC100: Add support for Compact Flash driver on SMDKC100 2010-08-05 18:30:50 +09:00
setup-keypad.c ARM: S5PC100: Add keypad device to the SMDKC100 board 2010-08-05 18:30:51 +09:00
setup-sdhci-gpio.c ARM: SAMSUNG: Add new s3c-sdhci card detection methods for Samsung SoCs 2010-08-05 18:32:50 +09:00
setup-sdhci.c ARM: S5PC100: cleanup hsmmc clock definitions 2010-08-05 18:30:51 +09:00