From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Jun 2013 19:12:41 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.11-rc1~64^2~166^2^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb180840a0c6bff7c0787373c23cefdf20417a27;p=pandora-kernel.git

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

cb180840a0c6bff7c0787373c23cefdf20417a27
Reading git-diff-tree failed