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)
commit236fa08168dd82af29a76c31c40b4148403774c0
tree73456604747ede3536a5b851ce4615aab96237f7
parent260b23674fdb570f3235ce55892246bef1c24c2a
parentdcab5e1eeccf5e226c771ecc013631cde157435f
Merge /pub/scm/linux/kernel/git/acme/net-2.6.15
net/netlink/af_netlink.c