From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 9 Dec 2013 20:30:27 +0000 (-0500)
Subject: Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath
X-Git-Tag: v3.14-rc1~94^2~482^2^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145babc68eebc4d72cd1a92d92e91739b905b7df;p=pandora-kernel.git

Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

Conflicts:
	drivers/net/wireless/ath/ath10k/htc.c
	drivers/net/wireless/ath/ath10k/mac.c
---

145babc68eebc4d72cd1a92d92e91739b905b7df
Reading git-diff-tree failed