tree 305c9968798adae3d9484657339fa39d2a5fdaac
parent 3ca9d1fc9aa64077645a26c396de9399b49ea226
parent 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f
author Kalle Valo <kvalo@qca.qualcomm.com> 1324062639 +0200
committer Kalle Valo <kvalo@qca.qualcomm.com> 1324062639 +0200

Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c