From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 8 May 2014 15:13:41 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.15-rc7~8^2~47^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6153871f77f8fa778cd0cf1e2979db75e25d3532;p=linux.git

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

6153871f77f8fa778cd0cf1e2979db75e25d3532