Merge "ath10k: Set fw feature flag for no 4addr hdr padding"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 14 Feb 2018 21:20:11 +0000 (13:20 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 14 Feb 2018 21:20:10 +0000 (13:20 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 14 Feb 2018 21:20:11 +0000 (13:20 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 14 Feb 2018 21:20:10 +0000 (13:20 -0800)
diff --cc drivers/net/wireless/ath/ath10k/core.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 14 Feb 2018 21:20:11 +0000 (13:20 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 14 Feb 2018 21:20:10 +0000 (13:20 -0800)