From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 7 Oct 2014 18:48:29 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.18-rc1~86^2~10^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3;p=linux.git

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

d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3