Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
commit05e5bd0f3daddb0368a433af5b58be68c62dc365
treea54c90523b72fb6e61b7bfe01fb8917e16825781
parentdaa16bc52ad8e9513506fca29a038a1460e63638
parentc288ec614e264b46853c65d3db9ccf91d53c9484
Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/cfg80211.c