From: Kalle Valo <kvalo@codeaurora.org>
Date: Sun, 6 Mar 2016 12:57:44 +0000 (+0200)
Subject: Merge 'net-next/master'
X-Git-Tag: v4.6-rc1~91^2~79^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89ef41bfaa46f24a14b776f1cd78c0e0b39e54ce;p=thirdparty%2Flinux.git

Merge 'net-next/master'

Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.
---

89ef41bfaa46f24a14b776f1cd78c0e0b39e54ce