]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita655cec0029351096d83f328917f6edda32ae621
treef91f581134b581e553c7fb1f6158172cee07a069
parent232627d662352b452512f690a4a5038df3c6c0bd
parent7e3c30bd174452d4601371e788cd6f5206893010
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