]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mac80211/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 22:46:52 +0000 (09:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 22:46:52 +0000 (09:46 +1100)

Trivial merge