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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2010-01-15 14:53:24 -08:00

parent bf0c346b3f 3ce2f76f5d

commit 9ddabb6700

3 changed files with 21 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

36

arch/arm/mach-s3c2440/mach-mini2440.c

View file

1

arch/arm/mach-s3c6410/mach-smdk6410.c

View file

4

arch/arm/plat-s3c/dev-nand.c

View file