From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 6 Mar 2008 01:49:38 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.25-rc5~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75;p=linux-2.6-omap-h63xx.git

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
---

da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75