From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 May 2012 02:18:09 +0000 (-0400)
Subject: iwlwifi: fix-up some merge damage from commit 0d6c4a2
X-Git-Tag: v3.5-rc1~109^2~79^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341352d13dae752610342923c53ebe461624ee2c;p=pandora-kernel.git

iwlwifi: fix-up some merge damage from commit 0d6c4a2

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed