From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 11 Jul 2014 19:52:57 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: pci-v3.17-changes-2~59^2~177^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95d01a669bd35d0e8eb28dd8a946876c00a9a61a;p=users%2Fdwmw2%2Flinux.git

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

95d01a669bd35d0e8eb28dd8a946876c00a9a61a