From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Oct 2009 18:59:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Tag: v2.6.32-rc4~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=df87f344efac96cb9f9367e82509208216f1e0fa;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  Revert "Revert "ide: try to use PIO Mode 0 during probe if possible""
  sis5513: fix PIO setup for ATAPI devices
---

df87f344efac96cb9f9367e82509208216f1e0fa