Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:03:30 +0000 (08:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:03:30 +0000 (08:03 -0700)
commit302f5bc54448bd2b37d5a8be9b6abc29397827ef
tree3486f92b13f6b53dd28388c1f2e5f33dc9866f20
parent18cb657ca1bafe635f368346a1676fb04c512edf
parentdd8717da6da9b0e745df49762be4573010f1013c
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