From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 5 Nov 2013 20:49:02 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: submit/tizen/20160607.132125~5255^2~3^2^2~309
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=353c78152c10027b8da5de446bad3472f977fcdc;p=sdk%2Femulator%2Femulator-kernel.git

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

Conflicts:
	net/wireless/reg.c
---

353c78152c10027b8da5de446bad3472f977fcdc