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

Browse source

...

This commit is contained in:

John W. Linville 2012-07-19 12:35:00 -04:00

parent 0cd06647b7 99102bd380

commit 3e497e0215

2 changed files with 4 additions and 1 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

1

net/mac80211/cfg.c

View file

4

net/wireless/reg.c

View file