From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Nov 2012 18:59:51 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: upstream/snapshot3+hdmi~6096^2~17^2~200
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f62248501cbf5047486601d7e39d5ee36d478c2;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

0f62248501cbf5047486601d7e39d5ee36d478c2