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)
commita4480ac4f966384f9d2db98bffec223e4eaf6150
tree25760cb0412316ef41cc73fa6c0ac6c4a577025f
parent4f46accee45d74a408e417c04c0ed1543a7c51e9
parentd8de72473effd674a3c1fe9621821f406f5587c9
Merge branch 'audit.b52' of git://git./linux/kernel/git/viro/audit-current

* '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