From: Johannes Berg Date: Mon, 20 Oct 2014 14:41:33 +0000 (+0200) Subject: Merge branch 'mac80211' into mac80211-next X-Git-Tag: v3.19-rc1~118^2~234^2^2~44 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8fa74e3aa6398ffef3c52147c969c0f5f0a1244e;p=linux.git Merge branch 'mac80211' into mac80211-next This was needed to avoid conflicts in the minstrel changes. Signed-off-by: Johannes Berg --- 8fa74e3aa6398ffef3c52147c969c0f5f0a1244e