Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Browse source

...

This commit is contained in:

John W. Linville 2013-03-04 14:24:02 -05:00

parent 466026989f 801d929ca7

commit 5ba0eb4ad1

6 changed files with 70 additions and 42 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

21

net/mac80211/cfg.c

View file

6

net/mac80211/iface.c

View file

28

net/mac80211/mlme.c

View file

3

net/mac80211/tx.c

View file

3

net/wireless/core.c

View file

51

net/wireless/nl80211.c

View file