summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:46:17 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 17:46:17 +0100
commit8c8c4bafc3a20a6fb9078315ff865bc42276f9ba (patch)
tree5ea72d40c55890b3c1c944fa4ef8dd386e6e7ba5 /include
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
parentlibata: fix translation for START STOP UNIT (diff)
downloadlinux-8c8c4bafc3a20a6fb9078315ff865bc42276f9ba.tar.xz
linux-8c8c4bafc3a20a6fb9078315ff865bc42276f9ba.zip
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: fix translation for START STOP UNIT libata-scsi: ata_task_ioctl should return ATA registers from sense data pata_platform: set_mode fix ata_if_xfermask() word 51 fix pata_sil680: PIO1 taskfile transfers overclocking fix (repost) libata: fix ata_eh_suspend() return value ahci: port_no should be used when clearing IRQ in ahci_thaw() Fix trivial conflict in drivers/ata/pata_platform.c manually
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions