From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Jan 2013 19:23:13 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: firefly_0821_release~3680^2~1139^2~6^2^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ead0ad1648990638e624f57d446f1fa4c577d87d;p=firefly-linux-kernel-4.4.55.git

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

ead0ad1648990638e624f57d446f1fa4c577d87d