Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author David Woodhouse <dwmw2@shinybook.infradead.org>

Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)

committer David Woodhouse <dwmw2@shinybook.infradead.org>

Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
author David Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
committer David Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
diff --cc kernel/audit.c
Simple merge
diff --cc net/netlink/af_netlink.c
Simple merge
author	David Woodhouse <dwmw2@shinybook.infradead.org>
	Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
committer	David Woodhouse <dwmw2@shinybook.infradead.org>
	Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
		1	2
kernel/audit.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history