Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Browse source

...

This commit is contained in:

John W. Linville 2014-06-25 15:15:14 -04:00

parent d6067f0e17 97dc94f1d9

commit 855df36de3

65 changed files with 2337 additions and 2312 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

MAINTAINERS

View file

3

drivers/net/wireless/at76c50x-usb.c

View file

3

drivers/net/wireless/ath/ath10k/mac.c

View file

3

drivers/net/wireless/ath/ath9k/main.c

View file

3

drivers/net/wireless/cw1200/scan.c

View file

2

drivers/net/wireless/cw1200/scan.h

View file

3

drivers/net/wireless/iwlegacy/common.c

View file

2

drivers/net/wireless/iwlegacy/common.h

View file

3

drivers/net/wireless/iwlwifi/dvm/mac80211.c

View file

5

drivers/net/wireless/iwlwifi/mvm/mac80211.c

View file

2

drivers/net/wireless/iwlwifi/mvm/mvm.h

View file

27

drivers/net/wireless/iwlwifi/mvm/scan.c

View file

69

drivers/net/wireless/mac80211_hwsim.c

View file

3

drivers/net/wireless/mwifiex/cfg80211.c

View file

3

drivers/net/wireless/ti/wl1251/main.c

View file

20

drivers/net/wireless/ti/wl12xx/scan.c

View file

2

drivers/net/wireless/ti/wl12xx/scan.h

View file

16

drivers/net/wireless/ti/wl18xx/scan.c

View file

2

drivers/net/wireless/ti/wl18xx/scan.h

View file

11

drivers/net/wireless/ti/wlcore/cmd.c

View file

3

drivers/net/wireless/ti/wlcore/cmd.h

View file

5

drivers/net/wireless/ti/wlcore/main.c

View file

2

drivers/net/wireless/ti/wlcore/scan.h

View file

2

drivers/net/wireless/ti/wlcore/wlcore.h

View file

3

include/linux/ieee80211.h

View file

38

include/net/cfg80211.h

View file

71

include/net/mac80211.h

View file

5

include/uapi/linux/nl80211.h

View file

17

net/mac80211/Kconfig

View file

6

net/mac80211/Makefile

View file

8

net/mac80211/agg-tx.c

View file

571

net/mac80211/cfg.c

View file

863

net/mac80211/chan.c

View file

3

net/mac80211/debugfs_sta.c

View file

20

net/mac80211/driver-ops.h

View file

244

net/mac80211/ethtool.c

View file

2

net/mac80211/ibss.c

View file

88

net/mac80211/ieee80211_i.h

View file

13

net/mac80211/iface.c

View file

10

net/mac80211/main.c

View file

4

net/mac80211/mesh.c

View file

30

net/mac80211/mesh_plink.c

View file

134

net/mac80211/mlme.c

View file

6

net/mac80211/offchannel.c

View file

6

net/mac80211/pm.c

View file

13

net/mac80211/rate.h

View file

278

net/mac80211/rc80211_pid.h

View file

478

net/mac80211/rc80211_pid_algo.c

View file

228

net/mac80211/rc80211_pid_debugfs.c

View file

2

net/mac80211/rx.c

View file

124

net/mac80211/scan.c

View file

201

net/mac80211/sta_info.c

View file

13

net/mac80211/sta_info.h

View file

7

net/mac80211/status.c

View file

293

net/mac80211/tdls.c

View file

7

net/mac80211/trace.h

View file

170

net/mac80211/tx.c

View file

270

net/mac80211/util.c

View file

20

net/mac80211/wep.c

View file

3

net/wireless/core.c

View file

86

net/wireless/ethtool.c

View file

6

net/wireless/ethtool.h

View file

15

net/wireless/nl80211.c

View file

54

net/wireless/rdev-ops.h

View file

59

net/wireless/trace.h

View file