From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 19 Jun 2013 18:50:44 +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~3680^2~254^2~34^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2f2a8846d51ed7342603a8d7c196fcc9e2f8a319;p=firefly-linux-kernel-4.4.55.git

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

2f2a8846d51ed7342603a8d7c196fcc9e2f8a319