Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 16:38:30 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 16:38:30 +0000 (09:38 -0700)
commit505683675cf0ed903765f160ad633f77ab90a9d4
tree4008d2e7c80f3d19d917752e1274d293630c7a44
parente4f3b1e74b67fdcdd3034b84997fad7912f182f6
parent3ad40d647d5e7c320385649e5eb422a5e89e035d
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: correct error code in selinux_audit_rule_init