From: Johannes Berg Date: Fri, 17 Jul 2015 13:39:38 +0000 (+0200) Subject: Merge branch 'mac80211' into mac80211-next X-Git-Tag: v4.3-rc1~96^2~155^2~26 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d;p=users%2Fjedix%2Flinux-maple.git Merge branch 'mac80211' into mac80211-next This is necessary to merge the new TDLS and mesh patches, as they depend on some fixes. Signed-off-by: Johannes Berg --- 72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d