From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Aug 2013 18:24:51 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.12-rc1~132^2~84^2^2~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0746663667f37e7be5646bf68cb452c8375a23d;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

d0746663667f37e7be5646bf68cb452c8375a23d