drivers/net/mv643xx_eth.c · 3d58cefd823e47209ffcac9cada0a618771da1a4 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

16 years ago
6ab33d51
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 6ab33d51
David S. Miller authored 16 years ago
```
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
```
6ab33d51

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/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
```