| commit | 4edfd20fafae41d77f210417b43d1416a733f48c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 4 Nov 2008 16:19:01 +0000 (4 08:19 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 4 Nov 2008 16:19:01 +0000 (4 08:19 -0800) | ||
| tree | 09abc81bdc493783d3962a66fc857aee4f5e4b4e | treesnapshot (tar.gz zip) |
| parent | 54074d59320581a6d7e4f4dd405e8cac1d174b75 | commitdiff |
| parent | 299246f9a2a4c5c531863d72bad7ebd0de213de9 | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: mask off DET when restoring SControl for detach
libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it
libata: Fix a potential race condition in ata_scsi_park_show()
sata_nv: fix generic, nf2/3 detection regression
sata_via: restore vt*_prepare_host error handling
sata_promise: add ATA engine reset to reset ops
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: mask off DET when restoring SControl for detach
libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it
libata: Fix a potential race condition in ata_scsi_park_show()
sata_nv: fix generic, nf2/3 detection regression
sata_via: restore vt*_prepare_host error handling
sata_promise: add ATA engine reset to reset ops