MAINTAINERS · 07c3c4ee3a4143d0c8bb2e260c089bf012cf2c6e · jan.koester / Linux · GitLab

Nov 11, 2009
2071a008
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 2071a008
David S. Miller authored Nov 11, 2009
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
```
2071a008
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored Nov 11, 2009
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
```