summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 11:59:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 11:59:22 -0700
commitff9cb43ce09a9069f0ec95375d2f403578ec4977 (patch)
treee31981c31f663d98ddb02021d25c44c75f0355f1 /init
parent2a4c13baebe30613cfa2c99d6a076f3a114dad9c (diff)
parent712e53e46a1da35fcd88c05aa0c675b10f7c0e9d (diff)
downloadlinux-3.10-ff9cb43ce09a9069f0ec95375d2f403578ec4977.tar.gz
linux-3.10-ff9cb43ce09a9069f0ec95375d2f403578ec4977.tar.bz2
linux-3.10-ff9cb43ce09a9069f0ec95375d2f403578ec4977.zip
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions