From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Jun 2013 18:28:21 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: next-20130617~118^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d90b9e29ec5fe7a08eb7965386ebb47615306584;p=karo-tx-linux.git

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

d90b9e29ec5fe7a08eb7965386ebb47615306584