aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 18:08:35 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 18:08:35 -0400
commit2af170dd241810212cbdbdc802ba7d39e3fb23b9 (patch)
tree3d16719aa102444337f161c457502704a4967a53 /kernel
parentab08ed1770140ebcf1be1657087689832b755874 (diff)
parent3be6cbd73f74b4a3da82cc7d6e1688a4ae595fc7 (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] kill ata_sg_is_last() Update libata driver for bf548 atapi controller against the 2.6.24 tree. libata-sff: Correct use of check_status() drivers/ata: add support to Freescale 3.0Gbps SATA Controller pata_acpi: fix build breakage if !CONFIG_PM
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions