]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 846f997 70670e4)
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)
* '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


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG