]> git.baikalelectronics.ru Git - kernel.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)
commit4030fd2ae1b1fb15b65872b9dd96ec3dadac6a01
treee1f6f2968299d35de6ef4ec04524f65d28342b1a
parentb89ae8805af7c4806512629e9eb50368b4a31c0c
parent3080f9cfcf2a09ec0ed1fadc4a528e27b39e55bf
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

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