Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 14 Oct 2007 13:29:00 +0000 (14:29 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 14 Oct 2007 13:29:00 +0000 (14:29 +0100)
commite3d18658d4f28e4783e1bb1c41e9134c9e5db0a9
treed4fe529460e98522775bc0ecca557dcc76866999
parenta2e1b833d9e0231d67e722b7e2f4d79daf919baf
parentcc5f4f28755b3b152297fd7bc3e03781dd8008e2
Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
drivers/mtd/ubi/scan.c