Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 20:54:12 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 20:54:12 +0000 (13:54 -0700)

Trivial merge