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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
---

d91a48cbae4cc12f6e8a65372a73ecf46f8f1b7f