]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 260b236 dcab5e1)
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 patch | diff1 | diff2 | blob | history

diff --cc net/netlink/af_netlink.c
Simple merge
Linux 2.6 source tree