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)
* 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"


Trivial merge