From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 18 Jun 2005 20:54:12 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
X-Git-Tag: v2.6.14-rc2~49^2~36^2~47
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1;p=linux-2.6-omap-h63xx.git

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

19fa95e9e999ee2b0d7adfbd1a687b136afcd6f1