-
- Downloads
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>
Showing
- Documentation/devicetree/bindings/net/can/sja1000.txt 4 additions, 0 deletionsDocumentation/devicetree/bindings/net/can/sja1000.txt
- drivers/net/can/at91_can.c 7 additions, 2 deletionsdrivers/net/can/at91_can.c
- drivers/net/can/dev.c 24 additions, 0 deletionsdrivers/net/can/dev.c
- drivers/net/can/sja1000/Kconfig 3 additions, 10 deletionsdrivers/net/can/sja1000/Kconfig
- drivers/net/can/sja1000/Makefile 0 additions, 1 deletiondrivers/net/can/sja1000/Makefile
- drivers/net/can/sja1000/sja1000.c 1 addition, 2 deletionsdrivers/net/can/sja1000/sja1000.c
- drivers/net/can/sja1000/sja1000_of_platform.c 0 additions, 220 deletionsdrivers/net/can/sja1000/sja1000_of_platform.c
- drivers/net/can/sja1000/sja1000_platform.c 133 additions, 61 deletionsdrivers/net/can/sja1000/sja1000_platform.c
- include/linux/can/dev.h 2 additions, 0 deletionsinclude/linux/can/dev.h
- include/uapi/linux/can.h 32 additions, 0 deletionsinclude/uapi/linux/can.h
Loading
Please register or sign in to comment