From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Apr 2014 19:01:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~279^2^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf4c69f7dd8e0c3427262cc11652227ec7256a75;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

bf4c69f7dd8e0c3427262cc11652227ec7256a75
Reading git-diff-tree failed