]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 18:59:22 +0000 (11:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 18:59:22 +0000 (11:59 -0700)
commitb728b7662d5f78b0f6a90111515d2f7e580c4e4f
treee31981c31f663d98ddb02021d25c44c75f0355f1
parent8ca4399770dd8d05f417df5b02795e2b7d4af52c
parenteb3e4bbd3c9ef2a2a07bbdb3aeab36d428589443
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: 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