From: David S. Miller <davem@davemloft.net>
Date: Thu, 11 Jun 2015 04:56:25 +0000 (-0700)
Subject: Merge tag 'linux-can-next-for-4.2-20150609' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~176^2~1587^2~105
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43559893be501d41d7833a1a0229c0bbd22b9c5c;p=firefly-linux-kernel-4.4.55.git

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

43559893be501d41d7833a1a0229c0bbd22b9c5c