• Linus Torvalds's avatar
    Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux · bbbfb910
    Linus Torvalds authored
    * '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")
    bbbfb910
mach-smartq5.c 3.44 KB