diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2009-11-11 13:04:42 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-11-11 13:04:42 -0800 |
| commit | ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b (patch) | |
| tree | 8402be8bd11e403690fd20f28d2c0dd24ba62a27 /net/ipv6 | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b.tar.xz linux-dev-ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b.zip | |
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 'net/ipv6')
0 files changed, 0 insertions, 0 deletions