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

56e9c0a6

Commit 56e9c0a6 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 6c00055a 9aab3e3e

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath9k/main.c 10 additions, 2 deletions

drivers/net/wireless/ath9k/main.c
drivers/net/wireless/ath9k/xmit.c 2 additions, 2 deletions

drivers/net/wireless/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn.c 15 additions, 12 deletions

drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c 46 additions, 31 deletions

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h 0 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-rx.c 4 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-scan.c 1 addition, 1 deletion

drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-tx.c 17 additions, 10 deletions

drivers/net/wireless/iwlwifi/iwl-tx.c

with 97 additions and 61 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