From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 16 Jan 2014 17:54:17 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2b755bbd8198161416ce24e3358817d8ede93037;p=~andy%2Flinux

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

2b755bbd8198161416ce24e3358817d8ede93037