tree a9d2f83e9ee9b20720cd83432ce7bfeb44690b3d
parent 3797455fd269f6ae0bc228d5206b502830af03f4
parent a97721894a6dc0f9ebfe1dbaa4bb112eaf399273
author Linus Torvalds <torvalds@linux-foundation.org> 1229554883 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229554883 -0800

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Add JBD2 compat feature bit.
  ocfs2: Always update xattr search when creating bucket.