From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 26 Apr 2013 12:37:39 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.10-rc1~132^2~18^2^2~8
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=222b048cb288ecfd4ea63ff89d670f1298416983;p=karo-tx-linux.git

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

222b048cb288ecfd4ea63ff89d670f1298416983