From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 7 Jul 2014 18:59:57 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.16~18^2~11^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b2388d03f871faec084666fe71acc770fad5160;p=users%2Fjedix%2Flinux-maple.git

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

1b2388d03f871faec084666fe71acc770fad5160