]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9af6b05 f9c3a38)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Mar 2008 01:49:38 +0000 (17:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Mar 2008 01:49:38 +0000 (17:49 -0800)
commitda71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75
tree9ce38e26ec55bc03d9d7aeb7dce188b9d73aa73etree | snapshot
parent9af6b056a281c81ae6043e0f5b4e2cb323f5bb43commit | diff
parentf9c3a3802119a2d30f3e4a69aef30a81e09d0209commit | 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:
  NFS: use new LSM interfaces to explicitly set mount options
  LSM/SELinux: Interfaces to allow FS to control mount options
Linux 2.6 source tree