Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Thu, 12 Apr 2012 06:45:11 +0000 (09:45 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 12 Apr 2012 06:45:11 +0000 (09:45 +0300)

Trivial merge