]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit07fe7e881c2e57785552c620f494eba8ee97c7d3
tree305c9968798adae3d9484657339fa39d2a5fdaac
parent9d6eaba2a917dd00b0501ecd0bb6639f9b23574a
parent058bb0e2b846b3842be2dbacb06aeb586ff6f640
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