Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

author David Woodhouse <[email protected]>

Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)

committer David Woodhouse <[email protected]>

Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)
author David Woodhouse <[email protected]>
Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)
committer David Woodhouse <[email protected]>
Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)
diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge
diff --cc drivers/mtd/maps/Kconfig
Simple merge
diff --cc drivers/mtd/maps/Makefile
Simple merge
diff --cc drivers/mtd/redboot.c
Simple merge
diff --cc include/linux/mtd/nand.h
Simple merge
author	David Woodhouse <[email protected]>
	Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)
committer	David Woodhouse <[email protected]>
	Fri, 11 Jul 2008 13:36:25 +0000 (14:36 +0100)
		1	2
arch/arm/mach-at91/at91sam9261_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/redboot.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mtd/nand.h	patch \|	diff1 \|	diff2 \|	blob \| history