Marek Puzyniak <marek.puzyniak@xxxxxxxxx> writes: > As a part of tdls implementation introduce > tdls related wmi data structures, constant > values and functions. > > Signed-off-by: Marek Puzyniak <marek.puzyniak@xxxxxxxxx> This patch had non-trivial conflicts, please check carefully my resolution in the pending branch. CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
