From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 21 Mar 2014 18:02:04 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.15-rc1~113^2~93^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49c0ca17ee8dd3530f688052d4eb2ae6d3e55119;p=thirdparty%2Flinux.git

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

49c0ca17ee8dd3530f688052d4eb2ae6d3e55119