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

Browse source

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

...

This commit is contained in:

John W. Linville 2012-08-21 16:00:21 -04:00

parent 22c5649eef dcf33963c4

commit 01e17dacd4

84 changed files with 1245 additions and 617 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

30

include/linux/nl80211.h

View file