From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 22 Aug 2012 18:15:47 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.7-rc1~145^2~278^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6de3f7e911d27d6737c79b3f6b5069044ea408ec;p=thirdparty%2Fkernel%2Flinux.git

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

6de3f7e911d27d6737c79b3f6b5069044ea408ec