Skip to content
Commit 0fac9e2d authored by Kalle Valo's avatar Kalle Valo
Browse files

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.
parents a39644b2 a6127b44
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment