diff options
author | 2007-09-26 08:57:27 -0700 | |
---|---|---|
committer | 2007-09-26 08:57:27 -0700 | |
commit | 4d3fac08718b49fc256bdb447a479d089ca97b78 (patch) | |
tree | 01bb670864df83f891c2b2a8eb576ad5c4b0bbe4 /drivers/acpi/debug.c | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff) | |
parent | pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode() (diff) | |
download | linux-dev-4d3fac08718b49fc256bdb447a479d089ca97b78.tar.xz linux-dev-4d3fac08718b49fc256bdb447a479d089ca97b78.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:
pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode()
sata_sil24: fix IRQ clearing race when PCIX_IRQ_WOC is used
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions