Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:47:30 +0000 (09:47 -0700)

Trivial merge