]> 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)
commit34592086cc88dfea850fcf3f9cae499db16b70fd
tree305c9968798adae3d9484657339fa39d2a5fdaac
parent2c4f72e83582aae5fbb0959120e1886f46006ad0
parenta1ded8eb4d608a3e2b35a52a817bc3d2b7e164af
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