Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3b95e9c0

Commit 3b95e9c0 authored 13 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of...

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

parents 5dc5503f 2a1e0fd1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath9k/hw.c 2 additions, 1 deletion

drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/rtlwifi/ps.c 9 additions, 8 deletions

drivers/net/wireless/rtlwifi/ps.c
net/mac80211/agg-tx.c 39 additions, 3 deletions

net/mac80211/agg-tx.c
net/wireless/nl80211.c 2 additions, 2 deletions

net/wireless/nl80211.c

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