From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 22 May 2014 17:53:27 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2c316e699fa40f2fc161ebb770b6e2845db4f3b0;p=openwrt%2Fstaging%2Fblogic.git

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

2c316e699fa40f2fc161ebb770b6e2845db4f3b0