summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-31 23:44:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-31 23:44:10 +0200
commit850761b2b13aec5d4f9935199e917f9a4ae00cce (patch)
tree0b45332cc3f1c7eda037c0e60d4a4415754c6c31 /fs/ocfs2
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parent[IA64] wire up sendmmsg() syscall for Itanium (diff)
downloadlinux-850761b2b13aec5d4f9935199e917f9a4ae00cce.tar.xz
linux-850761b2b13aec5d4f9935199e917f9a4ae00cce.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] wire up sendmmsg() syscall for Itanium
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions