drivers/net/vmxnet3/vmxnet3_ethtool.c · 6bd4dba3d2b8a90d27dfd32b306fa965650599b4 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

13 years ago
9cbc94ea
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9cbc94ea
David S. Miller authored 13 years ago
```
Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c
```
9cbc94ea

History
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored 13 years ago
```
Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c
```

vmxnet3_ethtool.c 18.79 KiB