| commit | df29ff379425954cb74b7beb642ca5b43ae557ae | |
| author | Reinette Chatre <reinette.chatre@intel.com> | |
| Fri, 22 May 2009 21:37:54 +0000 (22 14:37 -0700) | ||
| committer | John W. Linville <linville@tuxdriver.com> | |
| Wed, 3 Jun 2009 18:05:09 +0000 (3 14:05 -0400) | ||
| tree | e3e2cb39f9edc85f4d68971daf1adb142c39b0e5 | treesnapshot (tar.gz zip) |
| parent | ce2ebc9b8ddac020aa06c83a6d084c34017d835d | commitdiff |
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>
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>
| drivers/net/wireless/iwlwifi/iwl-core.c | diffblobblamehistory |