From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 13 Sep 2005 16:47:30 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
X-Git-Tag: v2.6.14-rc2~49
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d54e69c68c05b162a56f9914cae72afd7e6f40a;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
---

5d54e69c68c05b162a56f9914cae72afd7e6f40a