linux-stable-rt/arch/arm/mach-s5pc100/include/mach
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
..
debug-macro.S
dma.h
entry-macro.S
gpio.h
hardware.h
io.h
irqs.h Merge branch 'next-s5p' into for-next 2010-08-06 21:34:55 +09:00
map.h Merge branch 'next-samsung' into for-next 2010-08-06 21:49:18 +09:00
memory.h
pwm-clock.h
regs-clock.h ARM: S5PC100: Add support for Compact Flash driver on SMDKC100 2010-08-05 18:30:50 +09:00
regs-fb.h s3c-fb: initial move to unifying the header files 2010-08-11 08:59:10 -07:00
regs-gpio.h ARM: S5PC100: Fixup cross tree merge problems 2010-05-26 19:09:50 +09:00
regs-irq.h
spi-clocks.h
system.h ARM: S5P: Add Support common arch_reset() for S5P 2010-08-05 18:30:22 +09:00
tick.h
timex.h
uncompress.h
vmalloc.h