Merge branch 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:15:10 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:15:10 +0000 (12:15 -0700)
* 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] remove useless argument type in audit_filter_user()
  [PATCH] audit: fix kernel-doc parameter notation
  [PATCH] kernel/audit.c: nlh->nlmsg_type is gotten more than once


Trivial merge