]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0e48a24756da58de0c8035f8f3d19695f2adba64
treeef887505b3c904c548d58ec9bb6f4970a0877042
parent9b4a44adb967c363d9e0f6a6cdd7351cb63298f0
parent6724d01d7a24d0dd067dcc1784483691a1842357
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