Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 00:39:39 +0000 (17:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 00:39:39 +0000 (17:39 -0700)
commit725b70185d6b4ae73dc563725a95a0c10e242df5
tree35d241f6a643ca85ec9e50a66b5d55e6b984303f
parent26c4fdb0528ae7c4be9fbc8a8210f3b410e6b5aa
parent5b853ec3494e34eb4882f65ebbcd04b495ff3c85
Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2014-07-15

this is a pull request of 4 patches for net-next/master.

Prabhakar Lad contributes a patch that converts the c_can driver to use
the devm api. The remaining four patches by Nikita Edward Baruzdin
improve the SJA1000 driver with loopback testing support and introduce
a new testing mode presume ack, for successful transmission even if no
ACK is received.
====================

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