From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 27 Jun 2013 00:00:11 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.11-rc1~64^2~78^2^2~21
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=59731bb8c4f1536c5b698dc1aec82d7a5cef41eb;p=linux.git

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

59731bb8c4f1536c5b698dc1aec82d7a5cef41eb