From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jan 2010 20:35:18 +0000 (-0800)
Subject: Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.33-rc3~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=14107c750b840d6efd7fdf2f6d513f35e2eb6230;p=~shefty%2Frdma-dev.git

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
---

14107c750b840d6efd7fdf2f6d513f35e2eb6230