From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 8 Sep 2014 15:14:56 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.18-rc1~52^2~133^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a3d4f9d52c00b2016bc27fc66b10a194043f76;p=thirdparty%2Fkernel%2Flinux.git

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

61a3d4f9d52c00b2016bc27fc66b10a194043f76