From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Jul 2012 19:21:48 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.6-rc1~125^2~57^2~76
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8a50ace27134c8ef2b9ca4c47dd91cb733f52a53;p=linux.git

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

8a50ace27134c8ef2b9ca4c47dd91cb733f52a53