git » linux-kernel » commit df87f34

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

author Linus Torvalds
2009-10-08 18:59:06 UTC
committer Linus Torvalds
2009-10-08 18:59:06 UTC
parent 385c51d6b1dc7cdbbb1b189d18bb4680d0714a37
parent 032665a26f5fe230509c4d35bd53f69fb6aa45b0
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