| commit | 7b5ca22643beba8fdd5b7055e0594a514b3710d7 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 11 May 2009 19:42:55 +0000 (11 12:42 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 11 May 2009 19:42:55 +0000 (11 12:42 -0700) | ||
| tree | 5a2326eccbd4d3c4f22046a9a165ca4947575f48 | treesnapshot (tar.gz zip) |
| parent | 2b79bc4f7ebbd5af3c8b867968f9f15602d5f802 | commitdiff |
| parent | 124a6eece386226191ec79e279a5471bd2614f81 | 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:
ata_piix: The Sony TZ90 needs the cable type hardcoding
ata_piix: ICH7 does not support correct MWDMA timings
Avoid world-writable sysfs files in libata driver.
libata: fix suspend/resume for ATA SEMB devices
libata: clear ering on resume
pata_pdc202xx_old: fix UDMA33 handling
sata_mv: use new sata phy register settings for new devices
libata: fix attach error handling
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata_piix: The Sony TZ90 needs the cable type hardcoding
ata_piix: ICH7 does not support correct MWDMA timings
Avoid world-writable sysfs files in libata driver.
libata: fix suspend/resume for ATA SEMB devices
libata: clear ering on resume
pata_pdc202xx_old: fix UDMA33 handling
sata_mv: use new sata phy register settings for new devices
libata: fix attach error handling