Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commita8931ef380c92d121ae74ecfb03b2d63f72eea6f
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 11 Jul 2008 13:36:25 +0000 (11 14:36 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 11 Jul 2008 13:36:25 +0000 (11 14:36 +0100)
tree980fb6b019e11e6cb1ece55b7faff184721a8053
parent90574d0a4d4b73308ae54a2a57a4f3f1fa98e984
parente5a5816f7875207cb0a0a7032e39a4686c5e10a4
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
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