diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-09 18:04:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-09 18:04:00 (GMT) |
| commit | 87b0a0b5c46aea63cdc5c5d788fe2c91406e3161 (patch) | |
| tree | a33ee42c56bfaf4de51eb5522f3af9de428e10ba /fs/file.c | |
| parent | 9ed8111d021696e1f8ae3115a8a33bc6d34e6062 (diff) | |
| parent | b26082b9945a9aca85d51be37824f852617c7129 (diff) | |
| download | linux-fsl-qoriq-87b0a0b5c46aea63cdc5c5d788fe2c91406e3161.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'fs/file.c')
0 files changed, 0 insertions, 0 deletions