| commit | bde4f8fa8db2abd5ac9c542d76012d0fedab050f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 17 09:52:24 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 17 09:52:24 2008 -0700 |
| tree | 1be905db5b97da31358851aee538fa19ea6381c4 | |
| parent | 84841384ec6ec57544b76e564514d3f9eb6c1901 [diff] | |
| parent | c40e7cb89f9d36924131ef708ff1f16a76611add [diff] |
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: ahci: Add Marvell 6121 SATA support pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size ahci: implement skip_host_reset parameter ahci: request all PCI BARs devres: implement pcim_iomap_regions_request_all() libata-acpi: improve dock event handling