Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Oct 2009 21:39:22 +0000 (14:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Oct 2009 21:39:22 +0000 (14:39 -0700)
commit0eca52a92735f43462165efe00a7e394345fb38e
tree94c563b7ba022653d7b30092d3affa08235e0fd3
parent19d031e052bc213cdcbee70696d476136994b8c1
parent24df31acaff8465d797f0006437b45ad0f2a5cb1
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"
  ide: use printk_once