>> From: Tamizh chelvam <[email protected]>
>>
>> This patch enables thermal throttling support for 10.4 firmware.
>>
>> Signed-off-by: Tamizh chelvam <[email protected]>

>There was a trivial conflict, please check my conflict resolution in the 
>pending branch:

>https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6a3b459d9bb84bf6ae02cef084895898b18316a4

Looks good.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to