From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Oct 2014 18:09:36 +0000 (-0400)
Subject: Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~234^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=490f0dc4d52a01904cead9dd2fa57956ca737eb7;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/ath/wil6210/wil6210.h
---

490f0dc4d52a01904cead9dd2fa57956ca737eb7
Reading git-diff-tree failed