From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 2 Nov 2006 03:16:31 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.19-rc5~70
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7;p=linux.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:
  Revert "[PATCH] Add 0x7110 piix to ata_piix.c"
  [libata] sata_nv: Add PCI IDs
  [PATCH] ahci: fix status register check in ahci_softreset
---

aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7