Learn more about cloning repositories
You have read-only access
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6 Conflicts: drivers/mtd/Makefile