Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
Conflicts: drivers/mtd/Makefile
Showing
drivers/mtd/tests/Makefile
0 → 100644
Please register or sign in to comment
Conflicts: drivers/mtd/Makefile