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)
commita0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9
tree12d6c61b17e3b3b9874b9a0d1063e711af483b02
parente80ec84d9352419a7c0482edfbf1b96eaa4c8b95
parenta8c1f65c79cbbb2f7da782d4c9d15639a9b94b27
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