diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:32:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:32:36 -0700 |
| commit | 0894910cce8d9105e5d8457fd8686fe96dc958eb (patch) | |
| tree | a0ff479fa080f8373e9d90d45d96da023b459d14 /fs/9p | |
| parent | b2d597cb6d64d5e30236273249e3790434387743 (diff) | |
| parent | fb0582f91fdd62b67bf54a440d7c79b19ed84da8 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: adjust libata to ignore errors after spinup
ata_piix: add TECRA M7 to broken suspend list
pata_hpt{37x|3x2n}: fix clock reporting (take 2)
pata_hpt37x: actually clock HPT374 with 50 MHz DPLL (take 2)
pata_artop: fix UDMA5 for AEC6280[R] and UDMA6 for AEC6880[R]
ata_piix: update map 10b for ich8m
sata_mv: PCI IDs for Hightpoint RocketRaid 1740/1742
[libata] pata_isapnp: replace missing module device table
Diffstat (limited to 'fs/9p')
0 files changed, 0 insertions, 0 deletions