From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 13 Mar 2014 18:21:43 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42775a34d23027b19e984956a539448f5e7ff075;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

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

42775a34d23027b19e984956a539448f5e7ff075