iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage

Browse source

I may have botched my merge conflict resolution instructions for Dave...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

John W. Linville 2009-11-11 13:04:42 -08:00 • committed by David S. Miller

parent 2071a0084a

commit ddd21046e7

1 changed files with 1 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/net/wireless/iwlwifi/iwl-1000.c

View file