tree 94c563b7ba022653d7b30092d3affa08235e0fd3
parent 19d031e052bc213cdcbee70696d476136994b8c1
parent 24df31acaff8465d797f0006437b45ad0f2a5cb1
author Linus Torvalds <torvalds@linux-foundation.org> 1254778762 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1254778762 -0700

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 "ide: try to use PIO Mode 0 during probe if possible"
  ide: use printk_once