| commit | 9ddabb6700f82a033a76bcf7a547204fa12aaa17 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 15 14:53:24 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 15 14:53:24 2010 -0800 |
| tree | f35c7be566b9c1c02cce775562d70bb42e5e8e51 | |
| parent | bf0c346b3fbfb7315c5773767f3c7210fdeacce0 [diff] | |
| parent | 3ce2f76f5dfeeacd128db9e5cd6945bac0ea0b2a [diff] |
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