From: Johannes Berg Date: Wed, 6 Mar 2013 15:33:12 +0000 (+0100) Subject: Merge remote-tracking branch 'mac80211/master' into HEAD X-Git-Tag: v3.10-rc1~120^2~390^2^2~69^2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0f3a317f2f0e51ad2f8809c83b137958b385c7f;p=thirdparty%2Fkernel%2Flinux.git Merge remote-tracking branch 'mac80211/master' into HEAD There are a few things that would otherwise conflict. Signed-off-by: Johannes Berg --- c0f3a317f2f0e51ad2f8809c83b137958b385c7f