Merge tag 'linux-can-next-for-3.15-20140307' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-02-12
this is a pull request of twelve patches for net-next/master.
Alexander Shiyan contributes two patches for the mcp251x, one making
the driver more quiet and the other one improves the compile time
coverage by removing the #ifdef CONFIG_PM_SLEEP. Then two patches for
the flexcan driver by me, one removing the #ifdef CONFIG_PM_SLEEP, too,
the other one making use of platform_get_device_id(). Another patch by
me which converts the janz-ican3 driver to use netdev_<level>(). The
remaining 7 patches are by Oliver Hartkopp, they add CAN FD support to
the netlink configuration interface.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- drivers/net/can/dev.c 124 additions, 35 deletionsdrivers/net/can/dev.c
- drivers/net/can/flexcan.c 4 additions, 6 deletionsdrivers/net/can/flexcan.c
- drivers/net/can/janz-ican3.c 30 additions, 34 deletionsdrivers/net/can/janz-ican3.c
- drivers/net/can/mcp251x.c 6 additions, 11 deletionsdrivers/net/can/mcp251x.c
- include/linux/can/dev.h 5 additions, 2 deletionsinclude/linux/can/dev.h
- include/uapi/linux/can/netlink.h 3 additions, 0 deletionsinclude/uapi/linux/can/netlink.h
Loading
Please register or sign in to comment