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

4f4aeb7f

Commit 4f4aeb7f authored 14 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 a1868dc2 51a0d38d

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

drivers/net/wireless/ath/ath5k/base.c
net/mac80211/agg-tx.c 4 additions, 2 deletions

net/mac80211/agg-tx.c
net/mac80211/rx.c 11 additions, 2 deletions

net/mac80211/rx.c

with 18 additions and 18 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