]> 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)
commit9670109e87d8d3bfa5bdf4ae8fd11ebcd5c2073f
tree12d6c61b17e3b3b9874b9a0d1063e711af483b02
parent8af914f8dfd122b43d47e43613ce41f90b7f69a9
parent6bb2a7acea98a3c1bbe47ef62aaa7e8a69240c20
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