Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Thu, 14 Jun 2012 11:20:18 +0000 (14:20 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 14 Jun 2012 11:44:49 +0000 (14:44 +0300)
commitd987dd137bac8dca9b0015763d3106f48bb8a596
treeef887505b3c904c548d58ec9bb6f4970a0877042
parentc85251f8562095cd6fd63ae786354283c5318303
parent211c17aaee644bb808fbdeef547ac99db92c01ed
Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/core.h
drivers/net/wireless/ath/ath6kl/main.c