aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-25 15:48:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-25 15:48:24 -0700
commita41d7f000447015f3f5fe7223f1d53845268e2e8 (patch)
treefec20dc60808c32c61ec6e52787e5419a79e838a /kernel
parentd9b08b9efece1f397143378938e626d0de29e911 (diff)
parent960c8a10cbd47d1535996f40749b36f3d2c45f88 (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: pata_hpt37x: Further improvements based on the IDE updates and vendor drivers pata: Trivia [libata] sata_via, pata_via: Add PCI IDs. [libata] Fix decoding of 6-byte commands libata: sata_sis fixes Fix build failure for drivers/ata/pata_scc.c [libata] sata_mv: add TODO list [libata] sata_promise: fix flags typo
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions