Merge tag 'linux-can-fixes-for-3.15-20140519' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2014 05:58:30 +0000 (01:58 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2014 05:58:30 +0000 (01:58 -0400)
Marc Kleine-Budde says:

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

this is a pull request for net/master, for the v3.15 release cycle,
with a single patch.

Oliver Hartkopp's patch removes a Kconfig option in the c_can driver,
which was added as a workaround during the v3.15 development. With all
cleanup patches this workaround is not needed anymore.
====================

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

Trivial merge