Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

a80f509f

Commit a80f509f authored 17 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 246f19d1 04a9e451

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath5k/base.c 3 additions, 3 deletions

drivers/net/wireless/ath5k/base.c
drivers/net/wireless/iwlwifi/iwl-3945.c 4 additions, 3 deletions

drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965.c 18 additions, 5 deletions

drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-helpers.h 0 additions, 3 deletions

drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl3945-base.c 5 additions, 5 deletions

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

drivers/net/wireless/iwlwifi/iwl4965-base.c
include/linux/ieee80211.h 6 additions, 0 deletions

include/linux/ieee80211.h
net/mac80211/Kconfig 12 additions, 0 deletions

net/mac80211/Kconfig
net/mac80211/ieee80211.c 7 additions, 7 deletions

net/mac80211/ieee80211.c
net/mac80211/rc80211_pid_algo.c 1 addition, 1 deletion

net/mac80211/rc80211_pid_algo.c
net/mac80211/rc80211_simple.c 1 addition, 1 deletion

net/mac80211/rc80211_simple.c
net/mac80211/rx.c 7 additions, 0 deletions

net/mac80211/rx.c

with 69 additions and 33 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