Merge tag 'linux-can-next-for-4.2-20150609' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2015 04:56:25 +0000 (21:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Jun 2015 04:56:25 +0000 (21:56 -0700)
commit43559893be501d41d7833a1a0229c0bbd22b9c5c
treee35ea414296681998b88607d2140f6ef88e61d02
parentc3eee1fb1d308564ada5f7ea57bc51efc6130b37
parentdd895d7f21b244e7fd4c7477697e274de7e44ecb
Merge tag 'linux-can-next-for-4.2-20150609' of git://git./linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2015-05-06

this is a pull request of a two patches for net-next.

The first patch is by Tomas Krcka, he fixes the (currently unused)
register address for acceptance filters. Oliver Hartkopp contributes a
patch for the cangw, where an optional UID is added to reference
routing jobs.
====================

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