From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 17 Oct 2012 20:23:33 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v5.15~21178^2~2^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=290eddc4b3661dc4dfa95d199e0be5788928b3b1;p=platform%2Fkernel%2Flinux-starfive.git

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

290eddc4b3661dc4dfa95d199e0be5788928b3b1