diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 00:46:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-09 00:46:56 +0200 |
| commit | e228c1b51ef572843827630e643a682ef492b933 (patch) | |
| tree | 77360b4dadfbe2c33b8c7ef594a4f9494d00f858 /kernel | |
| parent | Fix format of MAINTAINERS (diff) | |
| parent | ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs (diff) | |
| download | linux-e228c1b51ef572843827630e643a682ef492b933.tar.xz linux-e228c1b51ef572843827630e643a682ef492b933.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:
ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
pata_sil680: remove duplicate pcim_enable_device
libata-sff: kill spurious WARN_ON() in ata_hsm_move()
sata_nv: disable hardreset for generic
ahci: disable PMP for marvell ahcis
sata_mv: add RocketRaid 1720 PCI ID to driver
ahci, pata_marvell: play nicely together
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions