From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Feb 2013 19:25:28 +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~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3b6990838cf39e152fb5c88ca81bddcdb4ae43e3;p=firefly-linux-kernel-4.4.55.git

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

3b6990838cf39e152fb5c88ca81bddcdb4ae43e3