drivers/net/wireless/rt2x00/rt2500pci.h · c17512d846a4b063c8d3e708d82c0664d9c7182e · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

15 years ago
19bc291c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 · 19bc291c
David S. Miller authored 15 years ago
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c
```
19bc291c

History
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
David S. Miller authored 15 years ago
```
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c
```