Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2008 14:45:49 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2008 14:45:49 +0000 (07:45 -0700)
commitd40c2f29f3b0f5937bace575722598dac474c478
treea757da81f2a5e8a145ccfbecbf624bf673f41f03
parent6be9f7b2835fa442f6b892f174dabc4023c0af2e
parent0794c66d49885a2f615618ce4940434b5b067d84
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: handle files opened with flags 3 by checking ioctl permission