diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-28 00:19:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-28 00:19:34 -0500 |
| commit | 61550022b9586972082904b80de26a464c558437 (patch) | |
| tree | 590c21eed5f723162d3821a398b6d3831f75a488 /net/ipv4/ipip.c | |
| parent | 0e36cbb344575e481167e090f0926701f83207d6 (diff) | |
| parent | e6afa00a1409bc3bceed9ccb33111519463dfe7b (diff) | |
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/ipip.c')
0 files changed, 0 insertions, 0 deletions