Merge remote-tracking branch 'wireless-next/master' into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Tue, 4 Feb 2014 16:29:45 +0000 (18:29 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Tue, 4 Feb 2014 16:29:45 +0000 (18:29 +0200)

Trivial merge