diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 20:59:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 20:59:44 +0200 |
| commit | bbbfb910d14988963fbc0b3fc5fc460daf21bf24 (patch) | |
| tree | d06629217c7b91f678ef821295f133c0ef6781fa /arch/alpha/defconfig | |
| parent | Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux (diff) | |
| parent | Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635 (diff) | |
| download | linux-bbbfb910d14988963fbc0b3fc5fc460daf21bf24.tar.xz linux-bbbfb910d14988963fbc0b3fc5fc460daf21bf24.zip | |
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")
Diffstat (limited to 'arch/alpha/defconfig')
0 files changed, 0 insertions, 0 deletions