Merge git://git.infradead.org/jffs2-xattr-2.6