From: David Woodhouse Date: Wed, 21 Nov 2012 10:38:13 +0000 (+0000) Subject: Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd X-Git-Url: https://rtime.felk.cvut.cz/gitweb/can-eth-gw-linux.git/commitdiff_plain/851462444d421c223965b12b836bef63da61b57f Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd Conflicts: drivers/mtd/nand/nand_base.c --- 851462444d421c223965b12b836bef63da61b57f