]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Fri, 13 Jan 2012 11:57:45 +0000 (13:57 +0200)
commit5545237c133c47fa99b66804cb979624f59fadc0
tree12d6c61b17e3b3b9874b9a0d1063e711af483b02
parent4de2efbb8852f96744f1d6a39da1d2b341b40ba1
parentadb987b1d07fe6536fe6c1fa358c4fa8bf84aaab
Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/usb.c
drivers/net/wireless/ath/ath6kl/htc.c
drivers/net/wireless/ath/ath6kl/init.c
drivers/net/wireless/ath/ath6kl/sdio.c