From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 21 Aug 2012 20:00:21 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: firefly_0821_release~3680^2~1874^2~42^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01e17dacd47101ad7d33152bbfbbd4394352d2e6;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c
---

01e17dacd47101ad7d33152bbfbbd4394352d2e6