Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Thu, 22 Sep 2011 07:33:13 +0000 (10:33 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 22 Sep 2011 07:33:13 +0000 (10:33 +0300)

Trivial merge