tree ee7ee877c56310cf8973fb8573c556a05cb5fc13
parent c50ca4fc5f77074fb2a36ad6b2b022ddb4837015
parent 0bb694d95ec29f1c74d8846e3cda7671786c5aed
author Ke Dong <kedong@google.com> 1414741105 -0700
committer Ke Dong <kedong@google.com> 1414783895 -0700

Merge branch 'vendor_drops' into wifi

Conflicts:
	drivers/net/wireless/ath/ath10k/ce.c
	drivers/net/wireless/ath/ath10k/core.c
	drivers/net/wireless/ath/ath10k/core.h
	drivers/net/wireless/ath/ath10k/htc.c
	drivers/net/wireless/ath/ath10k/htt_rx.c
	drivers/net/wireless/ath/ath10k/hw.h
	drivers/net/wireless/ath/ath10k/mac.c
	drivers/net/wireless/ath/ath10k/pci.c
	drivers/net/wireless/ath/ath10k/txrx.c
	drivers/net/wireless/ath/ath10k/wmi.c
	net/mac80211/agg-rx.c
	net/mac80211/ieee80211_i.h
	net/mac80211/iface.c
	net/wireless/genregdb.awk

NOTES:

The original patch backports-custom-0510-ath10k-memory-barrier.patch is
resolved by
http://lists.infradead.org/pipermail/ath10k/2014-August/002883.html
So I removed the temporary fix we put in.

The following patches have already been merged in the upstream backports drop.

backports-custom-0001-add-savedefconfig-target.patch
backports-custom-0522-ath10k-fix-rx-aggregation-reordering.patch
backports-custom-0001-log-beacon-info.patch
backports-custom-0523-ath10k-handle-attention-flags-correctly-when-A-MSDU.patch
backports-custom-0100-db.txt-parser-fix.patch
backports-custom-0524-correct-starting-seqno.patch
backports-custom-0515-reset-harder.patch
backports-custom-0530-firmware-10-2-support.patch
backports-custom-0516-retry-reset.patch
backports-custom-0600-set-antenna.patch
backports-custom-0520-fix-rx-reordering-with-RX_FLAG_AMSDU_MORE.patch
backports-custom-0650-ath9k-fix-aggregation-session-lockup.patch
backports-custom-0521-add-support-for-rx-reordering-offloading.patch
backports-custom-0910-ieee80211-phy-attrs.patch

Change-Id: Ifdd886c9ae68e5ba0d07aa5ed8b95d69780851cd