drivers/net/wireless/rt2x00/rt2x00rfkill.c · 30caa6e3d586442f7c3ad081260ee1b22bb123de · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

17 years ago
577f99c1
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 577f99c1
David S. Miller authored 17 years ago
```
Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c
```
577f99c1

History
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller authored 17 years ago
```
Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c
```