From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Jun 2008 19:15:10 +0000 (-0700)
Subject: Merge branch 'audit.b52' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit... 
X-Git-Tag: v2.6.26-rc9~98
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4480ac4f966384f9d2db98bffec223e4eaf6150;p=linux-2.6

Merge branch 'audit.b52' of git://git.kernel.org/pub/scm/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
---

a4480ac4f966384f9d2db98bffec223e4eaf6150