Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 1 Dec 2006 09:56:43 +0000 (09:56 +0000)
committerDavid Woodhouse <dwmw2@infradead.org>
Fri, 1 Dec 2006 09:56:43 +0000 (09:56 +0000)
commitbd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb
tree3f56594e813c6f35cbacbdb3e137ba5bfd0b3069
parent6c33cafc794d07c9254c160789120a0e98c088c9
parent0215ffb08ce99e2bb59eca114a99499a4d06e704
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/mtd/chips/cfi_cmdset_0001.c
drivers/mtd/nand/nand_base.c
include/linux/mtd/nand.h