Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • X xcap-capability-linux
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • xcap
  • xcap-capability-linux
  • Repository
Switch branch/tag
  • xcap-capability-linux
  • drivers
  • net
  • wireless
  • iwlwifi
  • iwl-core.c
Find file BlameHistoryPermalink
  • Reinette Chatre's avatar
    iwlwifi: fix merge error · df29ff37
    Reinette Chatre authored May 22, 2009
    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: default avatarReinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
    df29ff37