Merge 'ath-next' from https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git (for-next) Merged-SHA: 1be6c8d3027d4a421dc46b93a89a196c61945614 drivers/net/wireless/ath/ath12k/Kconfig | 2 ++ drivers/net/wireless/ath/ath12k/mac.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)