From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 27 Jun 2014 17:35:56 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.16-rc6~36^2~51^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9fa39e9ace5a8abbe9597c2970828ced67261da;p=thirdparty%2Fkernel%2Flinux.git

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

f9fa39e9ace5a8abbe9597c2970828ced67261da