tree e3e2cb39f9edc85f4d68971daf1adb142c39b0e5
parent ce2ebc9b8ddac020aa06c83a6d084c34017d835d
author Reinette Chatre <reinette.chatre@intel.com> 1243028274 -0700
committer John W. Linville <linville@tuxdriver.com> 1244052309 -0400

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>