From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 3 Jan 2012 20:16:34 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.3-rc1~182^2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57adc1fcbae2c13104ce291b40f23e40a414fa87;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
---

57adc1fcbae2c13104ce291b40f23e40a414fa87
Reading git-diff-tree failed