tree 4008d2e7c80f3d19d917752e1274d293630c7a44
parent e4f3b1e74b67fdcdd3034b84997fad7912f182f6
parent 3ad40d647d5e7c320385649e5eb422a5e89e035d
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187455110 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187455110 -0700

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: correct error code in selinux_audit_rule_init