From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Mar 2013 20:53:47 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.10-rc1~120^2~390^2^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d;p=thirdparty%2Fkernel%2Flinux.git

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

cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d