From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 9 Aug 2013 19:07:23 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~11825^2~297^2^2~23
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2437f3c5d6bc07252c6d7d24448755e0c35ed91c;p=mirror_ubuntu-artful-kernel.git

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

2437f3c5d6bc07252c6d7d24448755e0c35ed91c