Merge remote-tracking branch 'wireless-next/master' into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 23 Dec 2013 06:35:19 +0000 (08:35 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 23 Dec 2013 06:35:19 +0000 (08:35 +0200)

Trivial merge