diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 02:49:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 02:49:38 +0100 |
| commit | da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75 (patch) | |
| tree | 9ce38e26ec55bc03d9d7aeb7dce188b9d73aa73e /drivers/Makefile | |
| parent | Merge branch 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/dave... (diff) | |
| parent | NFS: use new LSM interfaces to explicitly set mount options (diff) | |
| download | linux-da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75.tar.xz linux-da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75.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:
NFS: use new LSM interfaces to explicitly set mount options
LSM/SELinux: Interfaces to allow FS to control mount options
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions