summaryrefslogtreecommitdiff
path: root/drivers/net/tap.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-04-26 14:21:00 +0300
committerKalle Valo <kvalo@codeaurora.org>2017-04-26 14:21:00 +0300
commit47d272f0f9887343f4e4d31bb22910b141b96654 (patch)
treeaa1745bc79d123048a063152bd18f9e78b69b8d0 /drivers/net/tap.c
parent9cc4b7cb86cbcc6330a3faa8cd65268cd2d3c227 (diff)
parent291084951825e1efca081926b10bf3ff7e872476 (diff)
downloadlinux-47d272f0f9887343f4e4d31bb22910b141b96654.tar.xz
Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
One more pull-request intended for 4.12. These are the changes: * The firmware for 7265D and 3168 NICs is frozen at version 29; * Sari continues working heavily on support for A000 series; * A bunch of fixes; * Some cleanups here and there;
Diffstat (limited to 'drivers/net/tap.c')
0 files changed, 0 insertions, 0 deletions