diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 03:36:12 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 03:36:12 +0200 |
commit | 44cad261025c04327fd7e847a7088fd3031b0c3e (patch) | |
tree | db43205d37c4ce5af8fa7980564e9baa7c72426b /fs/splice.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | SELinux: don't BUG if fs reuses a superblock (diff) | |
download | linux-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