diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 06:26:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 06:26:08 +0100 |
commit | 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 (patch) | |
tree | 1adceb5d74b574bb99b67dd0a7456e60f2fbd39f /arch | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | libata: relocate sdev->manage_start_stop configuration (diff) | |
download | linux-5d5d80001df3fbd06bd2b8893b6e3847e38a12d6.tar.xz linux-5d5d80001df3fbd06bd2b8893b6e3847e38a12d6.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: relocate sdev->manage_start_stop configuration
sata_sil24: freeze on non-dev errors reported via CERR
sata_sil24: fix stupid typo
ata_piix: ignore ATA_DMA_ERR on vmware ich4
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions