From: Doug Ledford <dledford@redhat.com>
Date: Thu, 20 Apr 2017 16:00:41 +0000 (-0400)
Subject: Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23790ba2d775698ed44ef37b8c72b94c73ae5a6c;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice
---

23790ba2d775698ed44ef37b8c72b94c73ae5a6c