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)
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>

Trivial merge