From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Mar 2012 17:45:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.4-rc1~177^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a282980937f9ca55a3cb06b9c6ff1cc49ea396;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c
---

01a282980937f9ca55a3cb06b9c6ff1cc49ea396
Reading git-diff-tree failed