From: Linus Torvalds Date: Mon, 5 Oct 2009 21:39:22 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Tag: Ubuntu-5.2.0-15.16~27461 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0eca52a92735f43462165efe00a7e394345fb38e;p=mirror_ubuntu-eoan-kernel.git 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 --- 0eca52a92735f43462165efe00a7e394345fb38e