tree 0e1b051a7ee108d3062949094da55626729d0a5b
parent b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d
parent b915543b46a2aa599fdd2169e51bcfd88812a12b
author Linus Torvalds <torvalds@g5.osdl.org> 1151773148 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1151773148 -0700

Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] audit syscall classes
  [PATCH] audit: support for object context filters
  [PATCH] audit: rename AUDIT_SE_* constants
  [PATCH] add rule filterkey