From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 4 Jan 2013 21:05:14 +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~5888^2~19^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d339fc8980955faca38141a4483761241b62e7c4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

d339fc8980955faca38141a4483761241b62e7c4