linux/arch/arm/plat-samsung
Linus Torvalds bbbfb910d1 Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
  DMAENGINE: correct PL080 register header file
  ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
  ARM: SMDK6410: Make virtual screen twice depth of real
  ARM: S3C64XX: Update consistent DMA size to 8MiB
  ARM: S3C64XX: Add audio support to SmartQ
  ARM: S3C64XX: Framebuffer fix for SmartQ5
  ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
  ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
  ARM: mach-real6410: add sdhc device support
  ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
  ARM: S3C64XX: Support for Real6410

Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")
2010-08-14 11:59:44 -07:00
..
include/plat Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
adc.c
clock-clksrc.c
clock.c
dev-adc.c
dev-fb.c
dev-hsmmc1.c
dev-hsmmc2.c
dev-hsmmc3.c
dev-hsmmc.c
dev-hwmon.c
dev-i2c0.c
dev-i2c1.c
dev-i2c2.c
dev-ide.c
dev-keypad.c
dev-nand.c
dev-onenand.c
dev-rtc.c
dev-ts.c
dev-uart.c
dev-usb-hsotg.c
dev-usb.c
dev-wdt.c
dma.c
gpio-config.c
gpio.c
gpiolib.c
init.c
irq-uart.c
irq-vic-timer.c
Kconfig Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
Makefile
platformdata.c
pm-check.c
pm-gpio.c
pm.c
pwm-clock.c
pwm.c
s3c-pl330.c
time.c
wakeup-mask.c