Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
David Woodhouse [Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)]
1  2 
kernel/audit.c
net/netlink/af_netlink.c

diff --cc kernel/audit.c
Simple merge
Simple merge