Learn more about cloning repositories
You have read-only access
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd Conflicts: drivers/mtd/nand/nand_base.c