Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 5 May 2005 12:59:37 +0000 (13:59 +0100)
commitbfd4bda097f8758d28e632ff2035e25577f6b060
tree022276b3625a432c7132e39776e7e448445087ac
parent488f2eaca1b0831a5a5e6a66e33bad2cdeff7238
parentb2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
kernel/audit.c
net/netlink/af_netlink.c