Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:50:37 +0000 (08:50 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 15:50:37 +0000 (08:50 -0700)
1  2 
net/netlink/af_netlink.c

Simple merge