From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 10 Oct 2013 17:19:58 +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~5
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c380a1fda55c7853c5e767998365247f4030ef3b;p=~andy%2Flinux

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

c380a1fda55c7853c5e767998365247f4030ef3b