Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700)
commit6469f540ea37d53db089c8fea9c0c77a3d9353d4
tree1dc9dc077150d57f4424cae49e711b5dd6e903a1
parent304e6d5fe294b80e6d3107f99ec241816390ebcc
parent78f28b7c555359c67c2a0d23f7436e915329421e
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.
arch/arm/mach-omap2/board-apollon.c
drivers/mtd/mtdblock.c
drivers/mtd/mtdcore.c
drivers/mtd/mtdpart.c