From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 2 Aug 2013 19:37:34 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.12-rc1~132^2~297^2^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=204162296edf0d0ac3e4dfd5bd0cac4af731b583;p=thirdparty%2Fkernel%2Flinux.git

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

204162296edf0d0ac3e4dfd5bd0cac4af731b583