diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-09 21:36:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-09 21:36:12 -0400 |
commit | 44cad261025c04327fd7e847a7088fd3031b0c3e (patch) | |
tree | db43205d37c4ce5af8fa7980564e9baa7c72426b /fs/ntfs/collate.c | |
parent | c5b9004baac077fb472cc7ac8293f2a9fc918d22 (diff) | |
parent | 5a55261716e838f188598ab3d7a0abf9cf1338f8 (diff) |
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 'fs/ntfs/collate.c')
0 files changed, 0 insertions, 0 deletions