From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 25 May 2007 01:20:42 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc3~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=91396c1e2d73a041d86935fb8371e8d48b48b663;p=linux-2.6-omap-h63xx.git

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:
  pata_via: Handle laptops via DMI
  libata: -ENODEV during prereset isn't an error
  libata: don't consider 0xff as port empty if SStatus is available
  ata_piix: add short 40c quirk for Acer Aspire 2030, take #2
  pata_sis: Fix and clean up some timing setups
  hpt3x2n: Correct revision boundary
---

91396c1e2d73a041d86935fb8371e8d48b48b663