Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

06f40a41

Commit 06f40a41 authored 12 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 db0fe0b2 290eddc4

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

drivers/bcma/main.c 3 additions, 2 deletions

drivers/bcma/main.c
drivers/net/wireless/brcm80211/brcmfmac/usb.c 1 addition, 1 deletion

drivers/net/wireless/brcm80211/brcmfmac/usb.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 24 additions, 44 deletions

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/ipw2x00/ipw2200.c 1 addition, 1 deletion

drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/dvm/devices.c 24 additions, 15 deletions

drivers/net/wireless/iwlwifi/dvm/devices.c
include/net/cfg80211.h 1 addition, 0 deletions

include/net/cfg80211.h
net/bluetooth/smp.c 4 additions, 2 deletions

net/bluetooth/smp.c
net/mac80211/iface.c 1 addition, 1 deletion

net/mac80211/iface.c
net/mac80211/mlme.c 23 additions, 12 deletions

net/mac80211/mlme.c
net/mac80211/sta_info.c 2 additions, 2 deletions

net/mac80211/sta_info.c
net/mac80211/util.c 2 additions, 2 deletions

net/mac80211/util.c
net/mac80211/wpa.c 10 additions, 4 deletions

net/mac80211/wpa.c
net/wireless/mlme.c 3 additions, 9 deletions

net/wireless/mlme.c

with 99 additions and 95 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