From: David S. Miller <davem@davemloft.net>
Date: Sat, 16 Jun 2012 08:23:04 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.6-rc1~125^2~531
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee289baaa02dd2ffa1189c1600d5572a10e0714;p=pandora-kernel.git

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

aee289baaa02dd2ffa1189c1600d5572a10e0714
Reading git-diff-tree failed