From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 18 Mar 2014 20:55:28 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.15-rc1~113^2~93^2^2~12
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=aa4a625088f9117f3bebfc21943c3d5d8a4cf81e;p=linux.git

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

aa4a625088f9117f3bebfc21943c3d5d8a4cf81e