From: Johannes Berg Date: Mon, 20 Oct 2014 14:41:33 +0000 (+0200) Subject: Merge branch 'mac80211' into mac80211-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8fa74e3aa6398ffef3c52147c969c0f5f0a1244e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'mac80211' into mac80211-next This was needed to avoid conflicts in the minstrel changes. Signed-off-by: Johannes Berg --- 8fa74e3aa6398ffef3c52147c969c0f5f0a1244e