Kalle Valo 0fac9e2dff Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git ...

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.

2017-10-16 17:09:24 +03:00

29 KiB

Raw Blame History

View Raw