Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 23:01:23 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 23:01:23 +0000 (15:01 -0800)
commit0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4
treea9d2f83e9ee9b20720cd83432ce7bfeb44690b3d
parent3797455fd269f6ae0bc228d5206b502830af03f4
parenta97721894a6dc0f9ebfe1dbaa4bb112eaf399273
Merge branch 'upstream-linus' of git://git./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.