diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-01-29 14:54:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-29 14:54:45 -0800 |
| commit | 4c72c53be5e3c8cf319a020ea671ab0fc32ec96f (patch) | |
| tree | dcd7204e6d17efad5631bdbb820d6e9c27dfdeb8 /drivers/net/ethernet/ti/Makefile | |
| parent | net: gianfar: remove the unneeded check of disabled device (diff) | |
| parent | can: peak_usb: add support for PEAK new CANFD USB adapters (diff) | |
| download | linux-dev-4c72c53be5e3c8cf319a020ea671ab0fc32ec96f.tar.xz linux-dev-4c72c53be5e3c8cf319a020ea671ab0fc32ec96f.zip | |
Merge tag 'linux-can-next-for-3.20-20150128' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-28-01
this is a pull request of 12 patches for net-next/master.
There are 3 patches by Ahmed S. Darwish, which update the kvaser_usb
driver and add support for the USBcan-II based adapters. Stéphane
Grosjean contributes 7 patches for the peak_usb driver, which add
support for the CANFD USB adapters. I contribute 2 patches which clean
up the peak_usb driver structure a bit.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/Makefile')
0 files changed, 0 insertions, 0 deletions