]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d328bc8 cb6a4e4)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:57:39 +0000 (12:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:57:39 +0000 (12:57 -0700)
1  2 
net/core/rtnetlink.c patch | diff1 | diff2 | blob | history

diff --cc net/core/rtnetlink.c
Simple merge
Michael's Linux tree.