Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commit44cad261025c04327fd7e847a7088fd3031b0c3e
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2008 01:36:12 +0000 (9 18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Apr 2008 01:36:12 +0000 (9 18:36 -0700)
treedb43205d37c4ce5af8fa7980564e9baa7c72426b
parentc5b9004baac077fb472cc7ac8293f2a9fc918d22
parent5a55261716e838f188598ab3d7a0abf9cf1338f8
Merge branch 'for-linus' of git://git./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