drivers/net/can/ti_hecc.c · d07d4c239bbf428db5581ccd5ca3770bbd15bfbd · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next · d07d4c23
David S. Miller authored Feb 04, 2012
```
Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.
```
d07d4c23

ti_hecc.c 32.1 KB