]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
* 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


Trivial merge