| commit | ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Nov 11 13:04:42 2009 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Wed Nov 11 13:04:42 2009 -0800 |
| tree | 8402be8bd11e403690fd20f28d2c0dd24ba62a27 | |
| parent | 2071a0084a0323697b7d6fd5a98982194bd6929f [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>