drivers/net/wireless/rndis_wlan.c · f019d51410a9b61278eeff811a1ca11d2a905241 · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

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

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h
```
65b53e4c

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

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h
```