From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 27 May 2014 17:47:27 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.16-rc1~27^2~122^2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=03c4444650969431b3a5effde4995de767e3013a;p=linux.git

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

03c4444650969431b3a5effde4995de767e3013a