From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 20 Jun 2012 18:40:26 +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~286
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=324640e3594e9d824e72e864001a83d003588363;p=linux.git

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

324640e3594e9d824e72e864001a83d003588363