From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Dec 2012 21:04:03 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
X-Git-Tag: firefly_0821_release~3680^2~1480^2~17^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c66cfd5325bb215a251f4685fac8718b1da33197;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
---

c66cfd5325bb215a251f4685fac8718b1da33197