From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Nov 2013 20:47:18 +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~176^2~4685^2~4^2^2~16
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d5aedd7e1b2f024ced0486aeb730bc56875e5ac9;p=firefly-linux-kernel-4.4.55.git

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

d5aedd7e1b2f024ced0486aeb730bc56875e5ac9