Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull-request for net-next/master. There is are 9 patches by
Fabio Baltieri and Kurt Van Dijck which add LED infrastructure and
support for CAN devices. Bernd Krumboeck adds a driver for the USB CAN
adapter from 8 devices. Oliver Hartkopp improves the CAN gateway
functionality. There are 4 patches by me, which clean up the CAN's
Kconfig.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- drivers/net/can/Kconfig 23 additions, 14 deletionsdrivers/net/can/Kconfig
- drivers/net/can/Makefile 2 additions, 0 deletionsdrivers/net/can/Makefile
- drivers/net/can/at91_can.c 10 additions, 0 deletionsdrivers/net/can/at91_can.c
- drivers/net/can/c_can/Kconfig 1 addition, 1 deletiondrivers/net/can/c_can/Kconfig
- drivers/net/can/c_can/c_can.c 10 additions, 0 deletionsdrivers/net/can/c_can/c_can.c
- drivers/net/can/cc770/Kconfig 1 addition, 1 deletiondrivers/net/can/cc770/Kconfig
- drivers/net/can/dev.c 25 additions, 1 deletiondrivers/net/can/dev.c
- drivers/net/can/flexcan.c 11 additions, 0 deletionsdrivers/net/can/flexcan.c
- drivers/net/can/led.c 124 additions, 0 deletionsdrivers/net/can/led.c
- drivers/net/can/mcp251x.c 19 additions, 4 deletionsdrivers/net/can/mcp251x.c
- drivers/net/can/mscan/Kconfig 1 addition, 1 deletiondrivers/net/can/mscan/Kconfig
- drivers/net/can/sja1000/Kconfig 7 additions, 7 deletionsdrivers/net/can/sja1000/Kconfig
- drivers/net/can/sja1000/sja1000.c 16 additions, 1 deletiondrivers/net/can/sja1000/sja1000.c
- drivers/net/can/slcan.c 7 additions, 1 deletiondrivers/net/can/slcan.c
- drivers/net/can/softing/Kconfig 1 addition, 1 deletiondrivers/net/can/softing/Kconfig
- drivers/net/can/ti_hecc.c 10 additions, 0 deletionsdrivers/net/can/ti_hecc.c
- drivers/net/can/usb/Kconfig 7 additions, 1 deletiondrivers/net/can/usb/Kconfig
- drivers/net/can/usb/Makefile 1 addition, 0 deletionsdrivers/net/can/usb/Makefile
- drivers/net/can/usb/usb_8dev.c 1033 additions, 0 deletionsdrivers/net/can/usb/usb_8dev.c
- include/linux/can/dev.h 11 additions, 0 deletionsinclude/linux/can/dev.h
Loading
Please register or sign in to comment