Merge git://git.infradead.org/jffs2-devel-2.6
authorDavid Woodhouse <[email protected]>
Sun, 21 May 2006 18:05:55 +0000 (19:05 +0100)
committerDavid Woodhouse <[email protected]>
Sun, 21 May 2006 18:05:55 +0000 (19:05 +0100)

Trivial merge