Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:53:24 +0000 (14:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:53:24 +0000 (14:53 -0800)
* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: MINI2440: Fixup __initdata usage
  ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier
  ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator
  ARM: S3C: NAND: Check the existence of nr_map before copying


Trivial merge