From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Sep 2011 07:23:13 +0000 (-0400)
Subject: Merge branch 'master' of github.com:davem330/net
X-Git-Tag: v3.2-rc1~129^2~243
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8decf868790b48a727d7e7ca164f2bcd3c1389c0;p=pandora-kernel.git

Merge branch 'master' of github.com:davem330/net

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
---

8decf868790b48a727d7e7ca164f2bcd3c1389c0
Reading git-diff-tree failed