]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 161801f) | patch
iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Nov 2009 21:04:42 +0000 (13:04 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 21:04:42 +0000 (13:04 -0800)
commit65c42aeac084aedd0c9d73f8706c215fc4cbf5a3
tree8402be8bd11e403690fd20f28d2c0dd24ba62a27tree | snapshot
parent161801fcd8d1517f436bacf5c870a0cb2411a59bcommit | diff
iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage

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>
drivers/net/wireless/iwlwifi/iwl-1000.c diff | blob | history
Linux Kernel Source Tree.