]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
projects / mirror_ubuntu-bionic-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 42ae66c e8803b6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 16 Jun 2012 08:23:04 +0000 (01:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 Jun 2012 08:23:04 +0000 (01:23 -0700)
commitaee289baaa02dd2ffa1189c1600d5572a10e0714
treef9fa3cb33ead21400dbda2b19287f6f06754fcb6tree
parent42ae66c80d94645e8f74080c7f344596d6f19cd5commit | diff
parente8803b6c387129059e04d9e14d49efda250a7361commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/ipv6/route.c

Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip6_fib.h diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
ubuntu-bionic-kernel mirror