]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f29bb5 992777f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Jun 2012 22:51:55 +0000 (15:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Jun 2012 22:51:55 +0000 (15:51 -0700)
commitbccb9c990e492cf087e1c5b0f40b60aed5f96246
tree46e68adf23f4f170a0eb5045c33a76234de6cf92tree | snapshot
parent2f29bb534cd0a95f445a833ad967d9ed8120e6f1commit | diff
parent992777f4a4459b84937a839cf03cfe71ead83dc6commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
992777f4a4459b84937a839cf03cfe71ead83dc6 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/c_can/c_can.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
net/core/dev.c 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.