From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 6 Nov 2007 01:43:04 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: upstream/snapshot3+hdmi~29158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8a9efb52847433c6a2e1598d78e49c42a9aa3c5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

f8a9efb52847433c6a2e1598d78e49c42a9aa3c5