Merge remote-tracking branch 'wireless-drivers-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 00:38:57 +0000 (11:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 00:38:57 +0000 (11:38 +1100)

Trivial merge