From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Mar 2013 20:38:28 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.10-rc1~120^2~170^2^2~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6;p=thirdparty%2Fkernel%2Fstable.git

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

31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6