diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-11-15 17:50:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-15 17:50:24 -0500 |
| commit | 7213dde6c961230d1e4c80fa20df842af573cd9d (patch) | |
| tree | e0c82d5155c009ff4a74281e37de8e75181789d5 /net/sctp/tsnmap.c | |
| parent | net: phy: smsc: Re-enable EDPD mode for LAN87xx (diff) | |
| parent | can: grcan: Add device driver for GRCAN and GRHCAN cores (diff) | |
| download | wireguard-linux-7213dde6c961230d1e4c80fa20df842af573cd9d.tar.xz wireguard-linux-7213dde6c961230d1e4c80fa20df842af573cd9d.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this pull request is for net-next, for the v3.8 release cycle. Muhammad
Ghias added support another board to the plx_pci sja1000 driver.
Matthias Fuchs improved the esd_usb2 driver with listen-only mode and
CAN-USB/Micro support. Andreas Larsson contributed a driver for the
GRHCAN CAN IP-Core
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/tsnmap.c')
0 files changed, 0 insertions, 0 deletions