projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91df42b ee446fd)
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
1  2 
net/ipv4/arp.c patch | diff1 | diff2 | blob | history
net/ipv6/addrconf.c patch | diff1 | diff2 | blob | history
net/ipv6/ndisc.c patch | diff1 | diff2 | blob | history

diff --cc net/ipv4/arp.c
Simple merge
diff --cc net/ipv6/addrconf.c
Simple merge
diff --cc net/ipv6/ndisc.c
Simple merge
Domain: System / Kernel;