From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 11 Oct 2006 18:19:47 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.19-rc2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e;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:
  [PATCH] pata-qdi: fix le32 in data_xfer
  [libata] sata_promise: add PCI ID
  [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl
  [PATCH] libata: Don't believe bogus claims in the older PIO mode register
---

6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e