From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 14 Oct 2013 17:22:59 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.12-rc7~20^2~20^2^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4db89e149cde12f9390bfe90807cf4c5de74fcde;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

4db89e149cde12f9390bfe90807cf4c5de74fcde