From: Johannes Berg Date: Wed, 10 Jun 2015 10:44:58 +0000 (+0200) Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~97^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206c59d1d7d42bcafc1d7f1e476e87e4427e2345;p=pandora-kernel.git Merge remote-tracking branch 'net-next/master' into mac80211-next Merge back net-next to get wireless driver changes (from Kalle) to be able to create the API change across all trees properly. Signed-off-by: Johannes Berg --- 206c59d1d7d42bcafc1d7f1e476e87e4427e2345 Reading git-diff-tree failed