Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:58:23 +0000 (14:58 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:58:23 +0000 (14:58 +0100)
commitebf8889bd1fe3615991ff4494635d237280652a2
tree10fb735717122bbb86474339eac07f26e7ccdf40
parentb160292cc216a50fd0cd386b0bda2cd48352c73b
parent752097cec53eea111d087c545179b421e2bde98a
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/mtd/maps/Kconfig
drivers/mtd/maps/physmap_of.c