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-12-02 13:20:03 -05:00

parent 019b952843 0834ae3c3a

commit a59b40b30f

2 changed files with 10 additions and 0 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

4

net/mac80211/ibss.c

View file

6

net/wireless/core.c

View file