From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 17 Dec 2013 18:32:20 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: upstream/snapshot3+hdmi~3687^2~4^2^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6a15802eee2dd8d401f5f89af31804f5a77f429;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

b6a15802eee2dd8d401f5f89af31804f5a77f429