From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2010 22:53:24 +0000 (-0800)
Subject: Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: firefly_0821_release~9833^2~3373
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9ddabb6700f82a033a76bcf7a547204fa12aaa17;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

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

9ddabb6700f82a033a76bcf7a547204fa12aaa17