Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 21 Nov 2011 15:02:46 +0000 (17:02 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 21 Nov 2011 15:02:46 +0000 (17:02 +0200)

Trivial merge