summaryrefslogtreecommitdiff
path: root/drivers/net/irda/smsc-sio.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-09 14:21:25 -0800
committerDavid S. Miller <davem@davemloft.net>2014-02-09 14:21:25 -0800
commit872c7e6fd214739328eafa5134d46a534c8ca60b (patch)
treebf0a635183991d681ece32c762581b36736804c6 /drivers/net/irda/smsc-sio.h
parentf41f03196041f91acad2b6d2b3e1f800aed60100 (diff)
parent0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9 (diff)
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 the 3.14 stream! For the mac80211 bits, Johannes says: "This is just a collection of small fixes, the commit logs explain the details. The only thing that isn't strictly a fix is the 5/10 MHz enabling, I had forgotten this and there's little point in waiting longer. The patch simply removes the force-disable code that I put in when there was a problem with the userspace API (that has long been fixed.)" For the iwlwifi bits, Emmanuel says: "I have an important fix that disables A band in case the driver thought it was enabled, and the firmware disagreed. We ended up making the firmware unhappy. I also fix the station table in AP mode and fix the scan while we have BT working. Johannes removes a static variable that could potentially lead to to issues on multi-device setups and disables scheduled scan to avoid issues with old versions of wpa_supplicant. A small fix from David on scan and a few new device IDs for 7265." On top of that... Oleksij Rempel adds a USB ID to the ar5523 driver and changes the default powersave setting for ath9k_htc to "off", due to observed stability issues (based on an equivalent ath9k patch). Stanislaw Gruszka similarly disables powersave for a couple of rt2x00 drivers. He also fixes a couple of scheduling while atomic issues in ath9k_htc. Sujith Manoharan rounds-out the powersave disables with one for ath9k. He also fixes a build prolem with ath9k on ARM and fixes an ath9k Tx power calculation. Finally, Andrea Merello fixes a couple of lingering DMA mapping problems in the rtl8180 driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/smsc-sio.h')
0 files changed, 0 insertions, 0 deletions