summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-01 00:28:01 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-01 00:28:01 +0400
commitd21c356b08820e60501ce7a42107a7f05863d91d (patch)
tree2cbb38e7f31dc98d41a66427c7f85e248c232ed9 /net
parent108b42b4b966462444265806e3d7260a632ad630 (diff)
parentbe9a50c8524b53003e5fa32f072945772ffd13a5 (diff)
downloadlinux-d21c356b08820e60501ce7a42107a7f05863d91d.tar.xz
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: [PATCH] libata: fix ata_xfer_tbl termination [PATCH] libata: make ata_qc_issue complete failed qcs [PATCH] libata: fix ata_qc_issue failure path [PATCH] ata_piix: fix ich6/m_map_db [libata] ahci: add ATI SB600 PCI IDs
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions