From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 30 Sep 2013 20:14:27 +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~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=15214c2f6cb15387e3bb06621010dd5609aba709;p=linux-2.6-block.git

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

15214c2f6cb15387e3bb06621010dd5609aba709