From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2008 14:45:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.25-rc9~100
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d40c2f29f3b0f5937bace575722598dac474c478;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:
  selinux: handle files opened with flags 3 by checking ioctl permission
---

d40c2f29f3b0f5937bace575722598dac474c478