From: Johannes Berg Date: Thu, 20 Feb 2014 10:55:12 +0000 (+0100) Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next X-Git-Tag: v3.15-rc1~113^2~18^2^2~47^2~30 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bf5f48339a019c9b4b42284c3f45d58942cbda27;p=linux-2.6-block.git Merge remote-tracking branch 'wireless-next/master' into mac80211-next --- bf5f48339a019c9b4b42284c3f45d58942cbda27