From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 May 2014 14:24:28 +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~23^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=025a58fd9d5785d63c398e96ac543db2639c7ddc;p=linux.git

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

025a58fd9d5785d63c398e96ac543db2639c7ddc