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 2013-08-01 15:26:52 -04:00

parent 2cdf359a52 c82b5a74cc

commit 7546ff9549

41 changed files with 1406 additions and 390 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

164

include/net/cfg80211.h

View file

4

include/net/ieee80211_radiotap.h

View file

30

include/net/mac80211.h

View file

153

include/uapi/linux/nl80211.h

View file