Merge tag 'linux-can-next-for-3.15-20140212' of git://gitorious.org/linux-can/linux...
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 23:16:00 +0000 (18:16 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 23:16:00 +0000 (18:16 -0500)
commit886ab57c848892ebdddabca9990415176cf90679
treeb2db893ef0aecacd26ffd9d1d69a4099a1b8885b
parent3410f22ea9693ed66e15a0764f20388bf39dd93d
parent17a50ee4bd47bdba94546e0526fc9ce93dc77d5e
Merge tag 'linux-can-next-for-3.15-20140212' of git://gitorious.org/linux-can/linux-can-next

linux-can-next-for-3.15-20140212

Marc Kleine-Budde says:

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

Florian Vaussard contributed a series that merged the sja1000 of_platform
into the platform driver. The of_platform driver is finally removed.
Stephane Grosjean supplied a patch to allocate CANFD skbs. In a patch
by Uwe Kleine-König another missing copyright information was added to
a userspace header. And a patch by Yoann DI RUZZA that adds listen only
mode to the at91_can driver.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/dev.c