summaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2015-05-22 10:47:02 +0300
committerKalle Valo <kvalo@codeaurora.org>2015-05-22 10:47:02 +0300
commitaefa441b150279dd8d25658e018898a3fe9a6769 (patch)
tree77e18517199fe6ae69a28154d24326c53abcf41c /drivers/net/tun.c
parentc411ead995b46f361b92116fd042ae83866044a1 (diff)
parent292208914d8ca5a41cf68c2f1d2810a2ea2044e9 (diff)
downloadlinux-aefa441b150279dd8d25658e018898a3fe9a6769.tar.bz2
Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* fix firmware name and other things to enable 3165 * fix bad APMG configuration for 8000 (no AMPG on these devices) * fix MAC address assignment for 8000 * fix firmware debugging triggers (MLME) * fix several bugs in low power states code (net-detect, d0i3)
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions