From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 22 May 2009 21:37:54 +0000 (-0700)
Subject: iwlwifi: fix merge error
X-Git-Tag: v2.6.31-rc1~330^2~157^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df29ff379425954cb74b7beb642ca5b43ae557ae;p=pandora-kernel.git

iwlwifi: fix merge error

This hunk of code was removed in patch "iwlwifi: do not
cancel delayed work inside spin_lock_irqsave" submitted at
http://marc.info/?l=linux-wireless&m=124267503030042&w=2

This same patch in this repo does not remove this hunk.
Remove it here.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed