From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jun 2012 18:40:38 +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~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ffddb1a93d732bb098e1833733624231c73dd72;p=thirdparty%2Flinux.git

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

9ffddb1a93d732bb098e1833733624231c73dd72