From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 24 Sep 2012 18:37:36 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: master-2012-09-24~55
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e5a876250d05d9708895da3d5408bdf67f1180f3;p=~andy%2Flinux

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

e5a876250d05d9708895da3d5408bdf67f1180f3