From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 4 Mar 2014 18:05:12 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.15-rc1~113^2~159^2^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b6a488a670f1be2666ab97e31dcfc0b1648884;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
---

f3b6a488a670f1be2666ab97e31dcfc0b1648884
Reading git-diff-tree failed