tree 46e68adf23f4f170a0eb5045c33a76234de6cf92
parent 91c8028c95a468da9c0aafd2d91cf24e27784206
parent 2a0c451ade8e1783c5d453948289e4a978d417c9
author David S. Miller <davem@davemloft.net> 1339800715 -0700
committer David S. Miller <davem@davemloft.net> 1339800715 -0700

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
2a0c451ade8e1783c5d453948289e4a978d417c9 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>