Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

3b908870

Commit 3b908870 authored 19 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'upstream-fixes' of...

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

parents 3b85418b 7c241d37

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 8 additions, 0 deletions

MAINTAINERS
drivers/net/wireless/bcm43xx/bcm43xx_dma.h 8 additions, 0 deletions

drivers/net/wireless/bcm43xx/bcm43xx_dma.h
drivers/net/wireless/bcm43xx/bcm43xx_pio.c 62 additions, 30 deletions

drivers/net/wireless/bcm43xx/bcm43xx_pio.c
drivers/net/wireless/bcm43xx/bcm43xx_pio.h 14 additions, 2 deletions

drivers/net/wireless/bcm43xx/bcm43xx_pio.h
drivers/net/wireless/hostap/hostap_ioctl.c 2 additions, 2 deletions

drivers/net/wireless/hostap/hostap_ioctl.c
include/net/ieee80211softmac.h 4 additions, 1 deletion

include/net/ieee80211softmac.h
net/ieee80211/softmac/ieee80211softmac_assoc.c 16 additions, 4 deletions

net/ieee80211/softmac/ieee80211softmac_assoc.c
net/ieee80211/softmac/ieee80211softmac_module.c 2 additions, 0 deletions

net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c 17 additions, 10 deletions

net/ieee80211/softmac/ieee80211softmac_wx.c

with 133 additions and 49 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