From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 14 Jun 2013 17:18:24 +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~166^2^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=65574866d1f3f6db328923f951218c2995b66c77;p=users%2Fdwmw2%2Flinux.git

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

65574866d1f3f6db328923f951218c2995b66c77