From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Mar 2009 18:59:22 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: MMI-PSA29.97-13-9~29297
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff9cb43ce09a9069f0ec95375d2f403578ec4977;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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: Use xs->bucket to set xattr value outside
  ocfs2: Fix a bug found by sparse check.
  ocfs2: tweak to get the maximum inline data size with xattr
  ocfs2: reserve xattr block for new directory with inline data
---

ff9cb43ce09a9069f0ec95375d2f403578ec4977