From: Linus Torvalds Date: Mon, 29 Mar 2010 16:37:57 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad4ba059005f18ec9e274966c16d99fc5ce8b2cd;p=linux-beck.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: skip probe if there are no devices on the port (v2)" Revert "via82cxxx: workaround h/w bugs" --- ad4ba059005f18ec9e274966c16d99fc5ce8b2cd