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)
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Trivial merge