]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac4a179 725eb20)
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)
commitae95b9af2c36fef9773044dd8932e5c49d65d7c2
tree46e68adf23f4f170a0eb5045c33a76234de6cf92tree | snapshot
parentac4a1797fe32f789915464ea00787bd25a1d5791commit | diff
parent725eb202aa23ea33289b28342cc7bb18978e4eb3commit | 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
725eb202aa23ea33289b28342cc7bb18978e4eb3 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.