From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 23 May 2014 14:55:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.15~15^2~20^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5ca2504ea36df1da815029a9e9277c08540042eb;p=linux.git

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

5ca2504ea36df1da815029a9e9277c08540042eb