diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-11-11 16:04:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-11 16:04:42 -0500 |
| commit | ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b (patch) | |
| tree | 8402be8bd11e403690fd20f28d2c0dd24ba62a27 /usr/gen_init_cpio.c | |
| 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>
Diffstat (limited to 'usr/gen_init_cpio.c')
0 files changed, 0 insertions, 0 deletions