Merge remote-tracking branch 'wireless-next/master' into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Thu, 24 Jul 2014 17:06:37 +0000 (20:06 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 24 Jul 2014 17:06:37 +0000 (20:06 +0300)

Trivial merge