Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

08740735

Commit 08740735 authored 13 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c

parents cd32984f ba542385

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h 1 addition, 1 deletion

drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/recv.c 9 additions, 1 deletion

drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/iwlegacy/iwl-core.c 2 additions, 2 deletions

drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlegacy/iwl-hcmd.c 1 addition, 1 deletion

drivers/net/wireless/iwlegacy/iwl-hcmd.c
drivers/net/wireless/iwlegacy/iwl-tx.c 3 additions, 1 deletion

drivers/net/wireless/iwlegacy/iwl-tx.c
drivers/net/wireless/iwlegacy/iwl3945-base.c 4 additions, 4 deletions

drivers/net/wireless/iwlegacy/iwl3945-base.c
drivers/net/wireless/iwlegacy/iwl4965-base.c 5 additions, 5 deletions

drivers/net/wireless/iwlegacy/iwl4965-base.c
drivers/net/wireless/rtlwifi/usb.c 1 addition, 0 deletions

drivers/net/wireless/rtlwifi/usb.c
net/wireless/nl80211.c 3 additions, 0 deletions

net/wireless/nl80211.c

with 29 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment