Merge branch 'master' of... (6153871f) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

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

Snippets Groups Projects

6153871f

Commit 6153871f authored 10 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 23a456f0 cabae811

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/net/cfg80211.h 12 additions, 0 deletions

include/net/cfg80211.h
net/mac80211/rx.c 2 additions, 1 deletion

net/mac80211/rx.c
net/mac80211/sta_info.c 2 additions, 1 deletion

net/mac80211/sta_info.c
net/mac80211/status.c 2 additions, 3 deletions

net/mac80211/status.c
net/mac80211/util.c 1 addition, 1 deletion

net/mac80211/util.c
net/wireless/scan.c 10 additions, 2 deletions

net/wireless/scan.c
net/wireless/sme.c 1 addition, 1 deletion

net/wireless/sme.c

with 30 additions and 9 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