From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 10 Jul 2014 21:14:14 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.16-rc6~36^2~15^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d672f939bc81513d28a5bfc570ed2f17d8f5b34a;p=users%2Fdwmw2%2Flinux.git

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

d672f939bc81513d28a5bfc570ed2f17d8f5b34a