From: David S. Miller <davem@davemloft.net>
Date: Fri, 15 Jun 2012 22:51:55 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.6-rc1~125^2~533
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e52b33bd50faa866bc3e6e97e68438bc5e52251;p=pandora-kernel.git

Merge git://git./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>
---

7e52b33bd50faa866bc3e6e97e68438bc5e52251
Reading git-diff-tree failed