Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Jul 2009 23:47:15 +0000 (16:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Jul 2009 23:47:15 +0000 (16:47 -0700)
commite5a7675dd503f778987ba1f181799ba5aadde319
treef6b8a39398fe79769189939d48a0641984eef7c6
parenteeaecb8619fb679006ab24a11ed292e37c74703c
parent3503e0acbfab0dbcd24ccadd5fe841f3f8290e81
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: improve handling of Power Management requests"