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

c925f1ea

Commit c925f1ea authored 18 years ago by Jeff Garzik

Downloads
- Plain Diff

Merge branch 'upstream' of...

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

parents 8083e165 884d3a2b

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/bcm43xx/bcm43xx.h 7 additions, 0 deletions

drivers/net/wireless/bcm43xx/bcm43xx.h
drivers/net/wireless/bcm43xx/bcm43xx_main.c 50 additions, 28 deletions

drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/bcm43xx/bcm43xx_main.h 3 additions, 0 deletions

drivers/net/wireless/bcm43xx/bcm43xx_main.h
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c 65 additions, 9 deletions

drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
drivers/net/wireless/hostap/hostap_cs.c 1 addition, 0 deletions

drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/prism54/isl_ioctl.c 30 additions, 0 deletions

drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/zd1211rw/zd_ieee80211.h 1 addition, 1 deletion

drivers/net/wireless/zd1211rw/zd_ieee80211.h
drivers/net/wireless/zd1211rw/zd_mac.c 1 addition, 1 deletion

drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.h 2 additions, 2 deletions

drivers/net/wireless/zd1211rw/zd_mac.h
drivers/net/wireless/zd1211rw/zd_usb.c 2 additions, 0 deletions

drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.h 7 additions, 7 deletions

drivers/net/wireless/zd1211rw/zd_usb.h

with 169 additions and 48 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