Merge branch 'ath10k-20180219' of...

Merge branch 'ath10k-20180219' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/linux-firmware

 into ath10k
Signed-off-by: Josh Boyer <jwboyer@kernel.org>

WHENCE

@@ -2751,7 +2751,7 @@ File: ath10k/QCA988X/hw2.0/firmware-4.bin
 Version: 10.2.4.45
 Licence: ath10k/QCA988X/hw2.0/notice_ath10k_firmware-4.txt
 File: ath10k/QCA988X/hw2.0/firmware-5.bin
-Version: 10.2.4.70.54
+Version: 10.2.4-1.0-00037
 Licence: ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA6174/hw2.1/board.bin
 File: ath10k/QCA6174/hw2.1/board-2.bin
@@ -2764,12 +2764,12 @@ File: ath10k/QCA6174/hw3.0/firmware-4.bin
 Version: WLAN.RM.2.0-00180-QCARMSWPZ-1
 Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
 File: ath10k/QCA6174/hw3.0/firmware-6.bin
-Version: WLAN.RM.4.4.1-00051-QCARMSWP-1
+Version: WLAN.RM.4.4.1-00079-QCARMSWPZ-1
 Licence: ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
 File: ath10k/QCA9377/hw1.0/board.bin
 File: ath10k/QCA9377/hw1.0/board-2.bin
 File: ath10k/QCA9377/hw1.0/firmware-5.bin
-Version: WLAN.TF.1.0-00267-1
+Version: WLAN.TF.1.0-00002-QCATFSWPZ-5
 Licence: ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA99X0/hw2.0/board.bin
 File: ath10k/QCA99X0/hw2.0/firmware-5.bin
@@ -2777,19 +2777,19 @@ Version: 10.4.1.00030-1
 Licence: ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA4019/hw1.0/board-2.bin
 File: ath10k/QCA4019/hw1.0/firmware-5.bin
-Version: 10.4-3.4-00082
+Version: 10.4-3.5.3-00053
 Licence: ath10k/QCA4019/hw1.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA9887/hw1.0/board.bin
 File: ath10k/QCA9887/hw1.0/firmware-5.bin
-Version: 10.2.4-1.0-00029
+Version: 10.2.4-1.0-00037
 Licence: ath10k/QCA9887/hw1.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA9888/hw2.0/board-2.bin
 File: ath10k/QCA9888/hw2.0/firmware-5.bin
-Version: 10.4-3.5.1-00014
+Version: 10.4-3.5.3-00053
 Licence: ath10k/QCA9888/hw2.0/notice_ath10k_firmware-5.txt
 File: ath10k/QCA9984/hw1.0/board-2.bin
 File: ath10k/QCA9984/hw1.0/firmware-5.bin
-Version: 10.4-3.4-00082
+Version: 10.4-3.5.3-00053
 Licence: ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt
 
 Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details

ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt

@@ -12,7 +12,7 @@ express written agreement, this file provides no license to any patents,
 trademarks, copyrights, or other intellectual property of Qualcomm Incorporated
 or any of its subsidiaries. 
 
-Copyright (c) 2015 Qualcomm Atheros, Inc. All rights reserved.
+Copyright (c) 2017 Qualcomm Atheros, Inc. All rights reserved.
 
 Qualcomm is a trademark of Qualcomm Incorporated, registered in the
 United States and other countries. All Qualcomm Incorporated trademarks

ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt

 =============================================================================
-"This Notice.txt file contains certain notices of software components 
-included with the software that Qualcomm Atheros, Inc. ("Qualcomm Atheros") 
+This Notice.txt file contains certain notices of software components
+included with the software that Qualcomm Atheros, Inc. (Qualcomm Atheros) 
 is required to provide you. Except where prohibited by the open source license, 
 the content of this notices file is only provided to satisfy Qualcomm Atheros's
 attribution and notice requirement; your use of these software components together
 with the Qualcomm Atheros software (Qualcomm Atheros software hereinafter referred
-to as "Software") is subject to the terms of your agreement from Qualcomm Atheros. 
+to as Software) is subject to the terms of your agreement from Qualcomm Atheros. 
 Compliance with all copyright laws and software license agreements included in the
 notice section of this file are the responsibility of the user. Except as may be 
 granted by separate express written agreement, this file provides no license to 
 any patents, trademarks, copyrights, or other intellectual property of Qualcomm
 Incorporated or any of its subsidiaries. 
 
-Copyright (c) 2015 Qualcomm Atheros, Inc. All rights reserved.
-
 Qualcomm is a trademark of Qualcomm Incorporated, registered in the United States
 and other countries. All Qualcomm Incorporated trademarks are used with permission.
-Atheros is a trademark of Qualcomm Atheros, Inc., registered in the United States
-and other countries. Other products and brand names may be trademarks or registered 
-trademarks of their respective owners."
+Other products and brand names may be trademarks or registered trademarks of their
+respective owners.
 =============================================================================
 
 NOTICES: