From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 4 Mar 2013 19:24:02 +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~921^2~28^2^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ba0eb4ad1d06f3d8f36dae02a0f2bf595d16ee4;p=firefly-linux-kernel-4.4.55.git

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

5ba0eb4ad1d06f3d8f36dae02a0f2bf595d16ee4