Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Jul 2006 16:59:08 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Jul 2006 16:59:08 +0000 (09:59 -0700)
commitfc25465f09414538afdbceacc517dd4dbabadeca
tree0e1b051a7ee108d3062949094da55626729d0a5b
parentb4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d
parentb915543b46a2aa599fdd2169e51bcfd88812a12b
Merge branch 'audit.b22' of git://git./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