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

4c07ab0f

Commit 4c07ab0f 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 cec5eb7b 6115e855

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath9k/core.c 2 additions, 2 deletions

drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/core.h 0 additions, 1 deletion

drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/main.c 8 additions, 4 deletions

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

drivers/net/wireless/ath9k/xmit.c
drivers/net/wireless/zd1211rw/zd_usb.c 1 addition, 0 deletions

drivers/net/wireless/zd1211rw/zd_usb.c

with 14 additions and 10 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