Merge git://git.infradead.org/mtd-2.6
authorKaiGai Kohei <kaigai@ak.jp.nec.com>
Thu, 18 May 2006 15:43:53 +0000 (00:43 +0900)
committerKaiGai Kohei <kaigai@ak.jp.nec.com>
Thu, 18 May 2006 15:43:53 +0000 (00:43 +0900)
commit20a92fc74c5c91c7bc5693d51acc2b99aceb0465
tree41bf535f38ff1a29c560bcf622e9b4ef03c2c106
parent21b9879bf2817aca343cdda11ade6a87f5373e74
parentf6a673b3f4f93c1c50e1b18f29254b0531b722a8
Merge git://git.infradead.org/mtd-2.6
fs/jffs2/file.c
fs/jffs2/nodelist.c
fs/jffs2/scan.c
fs/jffs2/summary.c
fs/jffs2/super.c
include/linux/jffs2.h