MAINTAINERS · 2e888103295f47b8fcbf7e9bb8c5da97dd2ecd76 · jan.koester / Linux · GitLab

Oct 08, 2008
4dd56513
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 4dd56513
David S. Miller authored Oct 08, 2008
```
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
```
4dd56513
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored Oct 08, 2008
```
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
```