| commit | da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 05 17:49:38 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Mar 05 17:49:38 2008 -0800 |
| tree | 9ce38e26ec55bc03d9d7aeb7dce188b9d73aa73e | |
| parent | 9af6b056a281c81ae6043e0f5b4e2cb323f5bb43 [diff] | |
| parent | f9c3a3802119a2d30f3e4a69aef30a81e09d0209 [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