From: Linus Torvalds Date: Fri, 29 Oct 2010 15:03:30 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Tag: v2.6.37-rc1~47 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=302f5bc54448bd2b37d5a8be9b6abc29397827ef Merge git://git./linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide: clean up timed out request handling hpt366: fix clock turnaround hpt366: add debounce delay to cable_detect() method --- 302f5bc54448bd2b37d5a8be9b6abc29397827ef