tree d94706b87fcad04d08a46a9b3555396d21ab41ec
parent 22c5649eef0fc37532e20c14d2656b28ca708a69
parent dcf33963c48e1959c83fda84e336dbb000eefa3f
author John W. Linville <linville@tuxdriver.com> 1345579221 -0400
committer John W. Linville <linville@tuxdriver.com> 1345579221 -0400

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

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c