summaryrefslogtreecommitdiff
path: root/net/vmw_vsock/Kconfig
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-01-24 14:27:53 +0200
committerKalle Valo <kvalo@codeaurora.org>2017-01-24 14:27:53 +0200
commitbd19b5ab1da654de456e102250822ec06311d6ad (patch)
tree1a882bcf6f280aff6a263198782ff3e647fd5c42 /net/vmw_vsock/Kconfig
parent92549cdc288f47f3a98cf80ac5890c91f5876a06 (diff)
parent03c902bff524e0cf664737a33f2365f7837040bf (diff)
Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* Remove an extra hyphen from a string that was preventing the firmware to load * Avoid a crash when the firmware is restarted in certain scenarios with DQA
Diffstat (limited to 'net/vmw_vsock/Kconfig')
0 files changed, 0 insertions, 0 deletions
02netfilter: merge ctinfo into nfct pointer storage areaFlorian Westphal1-5/+6 2017-02-02netfilter: guarantee 8 byte minalign for template addressesFlorian Westphal1-0/+2 2017-02-02netfilter: add and use nf_ct_set helperFlorian Westphal2-2/+9 2017-02-02skbuff: add and use skb_nfct helperFlorian Westphal1-1/+1 2017-02-02netfilter: reduce direct skb->nfct usageFlorian Westphal1-3/+6 2017-02-02netfilter: conntrack: no need to pass ctinfo to error handlerFlorian Westphal1-1/+1