git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2071a00) | 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)
commitddd21046e7b5e112b5a4722b7e071ae9d4c96a2b
tree8402be8bd11e403690fd20f28d2c0dd24ba62a27tree | snapshot
parent2071a0084a0323697b7d6fd5a98982194bd6929fcommit | 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
Full containers within linux kernel