From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 10 Jul 2014 21:00:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.17-rc1~106^2~12^2~132
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5c4d5e816c2cc86e17d09677b649be47fbc30e51;p=linux-block.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

5c4d5e816c2cc86e17d09677b649be47fbc30e51