]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita52cfa18a0503f82d68fab75139ce1c37f677c10
tree4ac79d10d435c778dbc712146732044be9d3af82
parent1b9231812b61647df97ef48d04987f24247c156f
parent0edb9d13a93d66fecfc3bc983dc0c543bb4d90bc
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"