| commit | df29ff379425954cb74b7beb642ca5b43ae557ae | [log] [tgz] |
|---|---|---|
| author | Reinette Chatre <reinette.chatre@intel.com> | Fri May 22 14:37:54 2009 -0700 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 03 14:05:09 2009 -0400 |
| tree | e3e2cb39f9edc85f4d68971daf1adb142c39b0e5 | |
| parent | ce2ebc9b8ddac020aa06c83a6d084c34017d835d [diff] |
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>