commit a37f6b84c4f3d3ca61634a7b36bf64c6ea452271
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 25 11:23:37 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 25 11:23:37 2009 -0700
tree 308105401c7c60f91903d6da78c938f1cc74578f
parent 9d73777e500929b71dcfed16eec05f6760e345a6
parent d7e2f36d9a92284754ed5254562766cb3d61c7ca

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:
  ide cs5520: Initialize second port's interrupt number.
  ide: improve handling of Power Management requests
  ide: add QUANTUM FIREBALLct20 30 with firmware APL.090 to ivb_list[]
  ide: relax DMA info validity checking
  ide-cd: Improve "weird block size" error message
  ide-cd: Don't warn on bogus block size unless it actually matters.
  ide: fix handling of unexpected IRQs vs request_irq()