Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)]
1  2 
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/redboot.c
include/linux/mtd/nand.h

Simple merge
Simple merge
Simple merge
Simple merge