kernel_optimize_test/arch/arm/include/asm/hardware
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
..
arm_timer.h
cache-l2x0.h
cache-tauros2.h
clps7111.h
coresight.h
cs89712.h
debug-8250.S
debug-pl01x.S
dec21285.h
entry-macro-iomd.S
ep7211.h
ep7212.h
gic.h
icst.h
ioc.h
iomd.h
iop3xx-adma.h
iop3xx-gpio.h
iop3xx.h
iop_adma.h
it8152.h
linkup-l1110.h
locomo.h
memc.h
pci_v3.h
pl080.h
pl330.h
sa1111.h
scoop.h
sp810.h
ssp.h
uengine.h
vic.h