diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:07:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:07:59 -0700 |
| commit | bc8844ed9b90d348011c31956dd7fef8549efb24 (patch) | |
| tree | 8ac56dd113348761c44ae5a635f70d5e907f5b38 /net/ipv6/tcp_ipv6.c | |
| parent | 12d810c1b8c2b913d48e629e2b5c01d105029839 (diff) | |
| parent | 471e44b26ef84658ee434087413c445bbe14686b (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Add drive to NCQ blacklist
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions