Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:28 +0000 (18:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:28 +0000 (18:32 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: return EOPNOTSUPP not ENOTSUPP


Trivial merge