projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 61edab8 6bbfd53)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:43:04 +0000 (17:43 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 6 Nov 2007 01:43:04 +0000 (17:43 -0800)
commitf8a9efb52847433c6a2e1598d78e49c42a9aa3c5
tree0f1ed130a72949a88ec2278d25ce5fc85847a089tree | snapshot
parent61edab8d144ae7b4d7206b91adec947579a73c0acommit | diff
parent6bbfd53d47abd1fb20d7c93a9b19a75970b66f49commit | diff
Merge branch 'upstream-linus' of /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
Domain: System / Uncategorized;