diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 17:43:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 17:43:04 -0800 |
commit | f8a9efb52847433c6a2e1598d78e49c42a9aa3c5 (patch) | |
tree | 0f1ed130a72949a88ec2278d25ce5fc85847a089 /mm/slab.c | |
parent | 61edab8d144ae7b4d7206b91adec947579a73c0a (diff) | |
parent | 6bbfd53d47abd1fb20d7c93a9b19a75970b66f49 (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: handle broken cable reporting
pata_hpt37x: Fix outstanding bug reports on the HPT374 and 37x cable detect
ata_piix: Add additional PCI identifier for 40 wire short cable
pata_serverworks: Fix problem with some drive combinations
libata: Don't disable dipm with SET FEATURES
libata and bogus LBA48 drives
Diffstat (limited to 'mm/slab.c')
0 files changed, 0 insertions, 0 deletions