-
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6David Woodhouse authored
Conflicts: drivers/mtd/mtdcore.c Merged in order that I can apply the Nomadik nand/onenand support patches.
6469f540
Conflicts: drivers/mtd/mtdcore.c Merged in order that I can apply the Nomadik nand/onenand support patches.