Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commitfe47463d4117e8f20905246ee660aa15eb811a18
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:28 +0000 (16 18:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Nov 2007 02:32:28 +0000 (16 18:32 -0800)
tree2a689b155dd839545067febfdcefdfe503b8a8b9
parent0048e1c44a4529d4ea93e6920fa5468730c68c94
parentec418781708f89ef6eb8eb5ef1eeb79a6bec9d69
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: return EOPNOTSUPP not ENOTSUPP