Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
Conflicts: drivers/mtd/Makefile
Showing
- drivers/mtd/Kconfig 8 additions, 0 deletionsdrivers/mtd/Kconfig
- drivers/mtd/Makefile 1 addition, 1 deletiondrivers/mtd/Makefile
- drivers/mtd/tests/Makefile 7 additions, 0 deletionsdrivers/mtd/tests/Makefile
- drivers/mtd/tests/mtd_oobtest.c 742 additions, 0 deletionsdrivers/mtd/tests/mtd_oobtest.c
- drivers/mtd/tests/mtd_pagetest.c 632 additions, 0 deletionsdrivers/mtd/tests/mtd_pagetest.c
- drivers/mtd/tests/mtd_readtest.c 253 additions, 0 deletionsdrivers/mtd/tests/mtd_readtest.c
- drivers/mtd/tests/mtd_speedtest.c 502 additions, 0 deletionsdrivers/mtd/tests/mtd_speedtest.c
- drivers/mtd/tests/mtd_stresstest.c 330 additions, 0 deletionsdrivers/mtd/tests/mtd_stresstest.c
- drivers/mtd/tests/mtd_subpagetest.c 525 additions, 0 deletionsdrivers/mtd/tests/mtd_subpagetest.c
- drivers/mtd/tests/mtd_torturetest.c 530 additions, 0 deletionsdrivers/mtd/tests/mtd_torturetest.c
Loading
Please register or sign in to comment