]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 05b4a69 1ff8393)
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)
commit708d4ac6897b2e78804b043154c6344ffe9cffbf
treef9fa3cb33ead21400dbda2b19287f6f06754fcb6tree | snapshot
parent05b4a69d4c1dfeede547d98e20e2b5b50a7af5f8commit | diff
parent1ff8393c7cc2aac2aa85edf1723e08c07c0f8a02commit | 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
Linux Kernel Source Tree.