]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
commit8965cfc45f18b0a5721d3c2da9d75458b81709e4
tree495baa14e638817941496c36e1443aed7dae0ea0
parent3d559bebb58c7ce036855c67ad55e33f5d03c345
parent056cffdceeb101af8aa7ddcafb5170669b010bf4
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
drivers/mtd/nand/nand_base.c