From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 7 Sep 2012 18:50:15 +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~163^2^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0374737727b65f31b9357051b421a3141c0d39ec;p=thirdparty%2Flinux.git

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

0374737727b65f31b9357051b421a3141c0d39ec