From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 14 Apr 2014 18:21:07 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.15-rc2~9^2~1^2^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0215f4cf7284a1f94cff180ff289a0de53c17917;p=users%2Fjedix%2Flinux-maple.git

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

0215f4cf7284a1f94cff180ff289a0de53c17917