Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 16:37:57 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 16:37:57 +0000 (09:37 -0700)
commitad4ba059005f18ec9e274966c16d99fc5ce8b2cd
tree4ac79d10d435c778dbc712146732044be9d3af82
parentf7454c5d5c33b84fdbb957b7ad4a432e333b2550
parent9ce41aed0d392246eb788786253f242e829fd5e1
Merge git://git./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"