include/net/sock.h · 3f551f9436c05a3b5eccdd6e94733df5bb98d2a5 · jan.koester / Linux · GitLab

Jun 06, 2010
eedc765c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · eedc765c
David S. Miller authored Jun 06, 2010
```
Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c
```
eedc765c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored Jun 06, 2010
```
Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c
```