From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Oct 2012 18:14:48 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: upstream/snapshot3+hdmi~6176^2~2^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efec22b4689bbfdbed26367219e981fcc946b9a6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

efec22b4689bbfdbed26367219e981fcc946b9a6