summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-01-28 06:19:34 +0100
committerDavid S. Miller <davem@davemloft.net>2013-01-28 06:19:34 +0100
commit61550022b9586972082904b80de26a464c558437 (patch)
tree590c21eed5f723162d3821a398b6d3831f75a488 /net/ipv4
parentnet: add RCU annotation to sk_dst_cache field (diff)
parentcan: gw: indicate and count deleted frames due to misconfiguration (diff)
downloadlinux-61550022b9586972082904b80de26a464c558437.tar.xz
linux-61550022b9586972082904b80de26a464c558437.zip
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>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions