From: Johannes Berg
Date: Tue, 4 Oct 2016 09:31:28 +0200
> Here's a version with the conflicts resolved - had to jigger some
> code around, but it's all described in the merge commit message.
>
> Let me know if there's any problem.
Pulled, thanks for resolving this.
Hi Dave,
Here's a version with the conflicts resolved - had to jigger some
code around, but it's all described in the merge commit message.
Let me know if there's any problem.
Thanks,
johannes
The following changes since commit 9a8dd213d2a38349e5ea2ca400952112b45c:
Merge branch 'ncsi-n
