]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Jan 2009 16:24:55 +0000 (16:24 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Jan 2009 16:24:55 +0000 (16:24 +0000)
commit572acc41274522b865440d0644d5f986e3c83755
treee1f6f2968299d35de6ef4ec04524f65d28342b1a
parent60f26520e7bd4479dbebf77317c45fc2255ba2e8
parent9faa8153bef4d82395e6ff7f87cb7c457055007c
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

Conflicts:
drivers/mtd/Makefile
drivers/mtd/Kconfig
drivers/mtd/Makefile