Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 18:59:06 +0000 (11:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 18:59:06 +0000 (11:59 -0700)
commitdf87f344efac96cb9f9367e82509208216f1e0fa
treee5423f3973852736438382576f8a432d67e11713
parent385c51d6b1dc7cdbbb1b189d18bb4680d0714a37
parent032665a26f5fe230509c4d35bd53f69fb6aa45b0
Merge git://git./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