From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 18 Oct 2007 22:08:35 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.24-rc1~289
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2af170dd241810212cbdbdc802ba7d39e3fb23b9;p=~shefty%2Frdma-dev.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:
  [libata] kill ata_sg_is_last()
  Update libata driver for bf548 atapi controller against the 2.6.24 tree.
  libata-sff: Correct use of check_status()
  drivers/ata: add support to Freescale 3.0Gbps SATA Controller
  pata_acpi: fix build breakage if !CONFIG_PM
---

2af170dd241810212cbdbdc802ba7d39e3fb23b9