Merge git://git.infradead.org/jffs2-xattr-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 20 May 2006 16:27:32 +0000 (17:27 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 20 May 2006 16:27:32 +0000 (17:27 +0100)
commit0cfc7da3ff4b39a3aac261ab3f6b1329e2485653
tree447073fe757b42e6da63b96a26cbbc6b4c705946
parent1417fc44ee923418df3adadeb4846c891bba1ba5
parent20a92fc74c5c91c7bc5693d51acc2b99aceb0465
Merge git://git.infradead.org/jffs2-xattr-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
fs/jffs2/dir.c
fs/jffs2/fs.c
fs/jffs2/gc.c
fs/jffs2/nodelist.h
fs/jffs2/os-linux.h
fs/jffs2/scan.c
fs/jffs2/summary.c
fs/jffs2/summary.h
include/linux/jffs2.h