kernel-fxtec-pro1x/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 ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
adc.h
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
audio.h
clock-clksrc.h
clock.h ARM: Merge for-2635/fb-updates1 2010-05-19 18:04:11 +09:00
cpu-freq.h
cpu.h ARM: Merge for-2635/fb-updates1 2010-05-19 18:04:11 +09:00
debug-macro.S
devs.h ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
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 ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
gpio-cfg-helpers.h
gpio-cfg.h ARM: SAMSUNG: gpio-cfg.h: update documentation 2010-05-28 19:31:32 +09:00
gpio-core.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-05-20 09:20:59 -07:00
hwmon.h
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
iic.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
irq-uart.h
irq-vic-timer.h
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
map-base.h
nand.h
onenand-core.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pll6553x.h
pm.h
regs-ac97.h
regs-adc.h
regs-ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
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 ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
regs-rtc.h ARM: SAMSUNG: Updates RTC register for support Alarm IRQ and Time Tick. 2010-08-05 18:32:51 +09:00
regs-sdhci.h
regs-serial.h ARM: SAMSUNG: serial: Add FRACVAL support for newer UART 2010-08-05 18:32:41 +09:00
regs-timer.h
regs-usb-hsotg-phy.h
regs-usb-hsotg.h USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode 2010-08-10 14:35:42 -07:00
regs-watchdog.h
s3c-dma-pl330.h
s3c-pl330-pdata.h
s3c64xx-spi.h ARM: S5P6440: Define SPI platform devices 2010-05-20 19:37:23 +09:00
sdhci.h Merge branch 'next-samsung' into for-next 2010-08-06 21:49:18 +09:00
ts.h ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
udc-hs.h
uncompress.h
usb-control.h
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h