request pull: bjdooks' samsung fixes

request pull: bjdooks' samsung fixes

[Ben Dooks]

Fixes for a couple of problems with the current ARM Samsung builds:

- touchscreen driver missing header files
- osiris and bast printing errors on non-existant custom fit nand devices

This is a slimed-down version of the previous pull request that seems to
have been ignored.

The following changes since commit 45d28b097280a78893ce25a5d0db41e6a2717853:
  Linus Torvalds (1):
        Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/.../frederic/random-tracing

are available in the git repository at:

  git://git.fluff.org/bjdooks/linux.git for-linus/samsung

Arnaud Patard (2):
      ARM: S3C24XX: touchscreen device definition
      ARM: S3C24XX: touchscreen device definition

Ben Dooks (5):
      ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices
      ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devices
      ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata().
      ARM: Merge next-simtec
      ARM: Merge s3c24xx-updates2

 arch/arm/mach-s3c2410/include/mach/ts.h |   21 +++++++++++++++++++++
 arch/arm/mach-s3c2410/mach-bast.c       |    3 +++
 arch/arm/mach-s3c2410/mach-h1940.c      |    8 ++++++++
 arch/arm/mach-s3c2440/mach-osiris.c     |    2 ++
 arch/arm/plat-s3c/dev-nand.c            |    4 +++-
 arch/arm/plat-s3c/include/plat/devs.h   |    1 +
 arch/arm/plat-s3c24xx/devs.c            |   18 ++++++++++++++++++
 arch/arm/plat-s3c24xx/s3c244x.c         |    1 +
 8 files changed, 57 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-s3c2410/include/mach/ts.h