From: David S. Miller <davem@davemloft.net>
Date: Mon, 21 Nov 2011 18:50:33 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.3-rc1~182^2~530
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd0bf97deeddd9ba53daabfc470a1399c6b0b2d;p=pandora-kernel.git

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

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
---

efd0bf97deeddd9ba53daabfc470a1399c6b0b2d
Reading git-diff-tree failed