From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 7 Mar 2014 20:09:32 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.14-rc7~10^2~26^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97bd5f0054ee879d778f4c7501ee2f88a9981ce2;p=thirdparty%2Fkernel%2Flinux.git

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

97bd5f0054ee879d778f4c7501ee2f88a9981ce2