]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 02:10:15 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 02:10:15 +0000 (12:10 +1000)

Trivial merge