From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 23 Jul 2014 17:01:14 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.16~18^2~11^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3b8de0749276abcb86bd7a6ca6691769a4ba7987;p=linux-block.git

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

3b8de0749276abcb86bd7a6ca6691769a4ba7987