Merge tag 'linux-can-next-for-4.12-20170427' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 May 2017 02:25:59 +0000 (22:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 May 2017 02:25:59 +0000 (22:25 -0400)
commit4750c7be5bcf2b2a6e0217d44499364ba67adec9
tree6292d6dad4e3a4af6f1fe3250cb20eda21ae1717
parent5d4e3443287b28a6e9c3436adbadba2497880bd1
parentc2701b370e6b4d0022043691b5ac7adad015e4fc
Merge tag 'linux-can-next-for-4.12-20170427' of git://git./linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2017-04-25

this is a pull request of 1 patch for net-next/master.

This patch by Oliver Hartkopp fixes the build of the broad cast manager
with CONFIG_PROC_FS disabled.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>