Merge branch 'master' of git://git.infradead.org/~dedekind/ubi-2.6
David Woodhouse [Sun, 14 Oct 2007 13:29:00 +0000 (14:29 +0100)]
1  2 
drivers/mtd/ubi/scan.c

Simple merge