drivers/net/3c503.c · a7d5b76d9a7e434e32a5b2815db45489617dcba6 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

"README.md" did not exist on "af4330631cd48987755f1a8d324dc318f60cf16b"

13 years ago
9f6ec8d6
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 9f6ec8d6
David S. Miller authored 13 years ago
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
```
9f6ec8d6

History
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored 13 years ago
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
```