Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Fri, 16 Dec 2011 19:10:39 +0000 (21:10 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Fri, 16 Dec 2011 19:10:39 +0000 (21:10 +0200)
commit7e95e365d5399647a41e10059e4b09826b82d78b
tree305c9968798adae3d9484657339fa39d2a5fdaac
parent3ca9d1fc9aa64077645a26c396de9399b49ea226
parent5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f
Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/debug.c
drivers/net/wireless/ath/ath6kl/debug.h
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath6kl/sdio.c