From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 5 Jan 2012 15:12:45 +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~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1032c736e81cdf490ae62f86da7efe67c3c3e61d;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/b43legacy/dma.c
---

1032c736e81cdf490ae62f86da7efe67c3c3e61d
Reading git-diff-tree failed