From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Oct 2013 18:04:00 +0000 (-0400)
Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87b0a0b5c46aea63cdc5c5d788fe2c91406e3161;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

John W. Linville says:

===================
Please pull this batch of fixes intended for 3.12...

Most of the bits are for iwlwifi -- Johannes says:

"I have a fix for WoWLAN/D3, a PCIe device fix, we're removing a
warning, there's a fix for RF-kill while scanning (which goes together
with a mac80211 fix) and last but not least we have many new PCI IDs."

Also for iwlwifi is a patch from Johannes to correct some merge damage
that crept into the tree before the last merge window.

On top of that, Felix Fietkau sends an ath9k patch to avoid a Tx
scheduling hang when changing channels to do a scan.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

87b0a0b5c46aea63cdc5c5d788fe2c91406e3161