From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 2 Aug 2013 18:54:19 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: firefly_0821_release~176^2~5487^2~25^2^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89b59bcd3ad54c5cd5540ae12275f738dad333fb;p=firefly-linux-kernel-4.4.55.git

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

89b59bcd3ad54c5cd5540ae12275f738dad333fb