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)
commitd968370ee7ce22583ab741961f0044d2922aa1a1
tree4c5375d7893d50eb6b5b17a1e0243c3b6469aefe
parentd97c121bb23d32ef631c553d2656f8ccf8349507
parente66a8ddff72e85605f2212a0ebc666c7e9116641
Merge remote branch 'wireless-next/master' into ath6kl-next
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath6kl/main.c
drivers/net/wireless/ath/ath6kl/txrx.c