From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 15 Jan 2008 05:26:08 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.24-rc8~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5d5d80001df3fbd06bd2b8893b6e3847e38a12d6;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: relocate sdev->manage_start_stop configuration
  sata_sil24: freeze on non-dev errors reported via CERR
  sata_sil24: fix stupid typo
  ata_piix: ignore ATA_DMA_ERR on vmware ich4
---

5d5d80001df3fbd06bd2b8893b6e3847e38a12d6