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

6440be17

Commit 6440be17 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents 49186b4a 09971493

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 2 additions, 4 deletions

MAINTAINERS
drivers/net/wireless/ath5k/hw.c 10 additions, 4 deletions

drivers/net/wireless/ath5k/hw.c
drivers/net/wireless/b43/dma.c 39 additions, 8 deletions

drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/main.c 28 additions, 4 deletions

drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/phy.c 1 addition, 1 deletion

drivers/net/wireless/b43/phy.c
drivers/net/wireless/iwlwifi/iwl3945-base.c 0 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c 0 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl4965-base.c
drivers/net/wireless/prism54/isl_ioctl.c 1 addition, 1 deletion

drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/rndis_wlan.c 3 additions, 2 deletions

drivers/net/wireless/rndis_wlan.c
drivers/ssb/pci.c 5 additions, 0 deletions

drivers/ssb/pci.c
include/linux/ieee80211.h 13 additions, 7 deletions

include/linux/ieee80211.h
net/mac80211/mlme.c 25 additions, 3 deletions

net/mac80211/mlme.c
net/mac80211/rx.c 1 addition, 1 deletion

net/mac80211/rx.c
net/mac80211/wme.c 1 addition, 1 deletion

net/mac80211/wme.c

with 129 additions and 38 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