From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Nov 2012 15:56:03 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~3680^2~1480^2~174^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=79d38f7d6cf545ff838dd5227869f3916d1d100d;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c
---

79d38f7d6cf545ff838dd5227869f3916d1d100d