linux-stable-rt/arch/arm/plat-samsung/include/plat
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
..
adc-core.h
adc.h
ata-core.h
ata.h
audio.h
clock-clksrc.h
clock.h
cpu-freq.h
cpu.h
debug-macro.S
devs.h
dma-core.h
dma-s3c24xx.h
dma.h
fb-core.h s3c-fb: add device name initialization 2010-08-11 08:59:10 -07:00
fb.h s3c-fb: add default window feature. 2010-08-11 08:59:09 -07:00
fimc-core.h
gpio-cfg-helpers.h
gpio-cfg.h
gpio-core.h
hwmon.h
iic-core.h
iic.h
irq-uart.h
irq-vic-timer.h
keypad-core.h
keypad.h
map-base.h
nand.h
onenand-core.h
pll6553x.h
pm.h
regs-ac97.h
regs-adc.h
regs-ata.h
regs-fb-v4.h s3c-fb: integrate palette setup code into main driver 2010-08-11 08:59:10 -07:00
regs-fb.h s3c-fb: add support for DMA channel control on S5PV210 2010-08-11 08:59:12 -07:00
regs-iic.h
regs-irqtype.h
regs-nand.h
regs-onenand.h
regs-rtc.h
regs-sdhci.h
regs-serial.h
regs-timer.h
regs-usb-hsotg-phy.h
regs-usb-hsotg.h
regs-watchdog.h
s3c-dma-pl330.h
s3c-pl330-pdata.h
s3c64xx-spi.h
sdhci.h
ts.h
udc-hs.h
uncompress.h
usb-control.h
wakeup-mask.h
watchdog-reset.h