Commit 38ce7945 authored by Linaro CI's avatar Linaro CI
Browse files

Merge remote-tracking branch 'alimon-fixes/tracking-qcomlt-fixes-alimon' into... 

Merge remote-tracking branch 'alimon-fixes/tracking-qcomlt-fixes-alimon' into integration-linux-qcomlt

# Conflicts:
#	drivers/net/wireless/ath/wcn36xx/smd.c
#	drivers/net/wireless/ath/wcn36xx/txrx.c
parents 9d6c1962 cc6248da
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment