Merge tag 'linux-can-fixes-for-3.15-20140528' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:32:53 +0000 (17:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 May 2014 00:32:53 +0000 (17:32 -0700)
Marc Kleine-Budde says:

====================
pull-request: can 2014-05-28

here's a pull request for v3.15, hope it's not too late.

Oliver Hartkopp fixed a bug in the CAN led trigger device renaming code.
====================

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

Trivial merge