drivers/net/tokenring/tmspci.c · af22ab1bd20e9dedf3a37cc1d401ef8bbd587ef0 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

16 years ago
508827ff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 508827ff
David S. Miller authored 16 years ago
```
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
```
508827ff

History
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored 16 years ago
```
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
```