]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a6db58) | patch
iwlwifi: fix merge error
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 22 May 2009 21:37:54 +0000 (14:37 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 3 Jun 2009 18:05:09 +0000 (14:05 -0400)
commit6326a0c1c203c33d4cd63484deb202cc9b1c5a28
treee3e2cb39f9edc85f4d68971daf1adb142c39b0e5tree | snapshot
parent7a6db58e8fc6572df3bdc341d76c93eea9113736commit | 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>
drivers/net/wireless/iwlwifi/iwl-core.c diff | blob | history
Linux Kernel Source Tree.