Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:35:18 +0000 (12:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:35:18 +0000 (12:35 -0800)
commit14107c750b840d6efd7fdf2f6d513f35e2eb6230
treef91f581134b581e553c7fb1f6158172cee07a069
parent846f99749ab68bbc7f75c74fec305de675b1a1bf
parent70670e4b8d75291f7d03771e26f7f7794d2d3eba
Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata().
  ARM: S3C24XX: touchscreen device definition
  ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devices
  ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices
  ARM: S3C24XX: touchscreen device definition