Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:50:55 +0000 (09:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:50:55 +0000 (09:50 -0800)
commita58695bb9d63764da9607bf1e7ff09ef03b190a8
tree07ddae612b3f76769afad56ba99d225a65efee7e
parent413623e70765ffd5679c600aea28022e23d9f44b
parent0fb18c4777ff424c1db694af98443a201fa4fc30
Merge git://git./linux/kernel/git/davem/ide-2.6

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