From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2008 23:01:23 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.28-rc9~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4;p=linux-2.6-omap-h63xx.git

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.
---

0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4