From: David S. Miller <davem@davemloft.net>
Date: Fri, 16 Dec 2011 07:11:14 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.3-rc1~182^2~207
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b26e478f8fd5b575684f021b05a5c6236ebb911a;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c
---

b26e478f8fd5b575684f021b05a5c6236ebb911a
Reading git-diff-tree failed