summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-10 03:36:12 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-10 03:36:12 +0200
commit44cad261025c04327fd7e847a7088fd3031b0c3e (patch)
treedb43205d37c4ce5af8fa7980564e9baa7c72426b /fs/splice.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentSELinux: don't BUG if fs reuses a superblock (diff)
downloadlinux-44cad261025c04327fd7e847a7088fd3031b0c3e.tar.xz
linux-44cad261025c04327fd7e847a7088fd3031b0c3e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: don't BUG if fs reuses a superblock
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions