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
drivers/mtd/tests/mtd_oobtest.c
0 → 100644
drivers/mtd/tests/mtd_pagetest.c
0 → 100644
drivers/mtd/tests/mtd_readtest.c
0 → 100644
drivers/mtd/tests/mtd_speedtest.c
0 → 100644
想要评论请 注册 或 登录