Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

Browse source

...

This commit is contained in:

John W. Linville 2013-01-09 14:22:45 -05:00

parent e7f767a7d9 2d31986764

commit 79afb22d09

3 changed files with 83 additions and 33 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

90

drivers/net/wireless/mac80211_hwsim.c

View file

5

net/mac80211/mesh_hwmp.c

View file

21

net/wireless/reg.c

View file