From: Linus Torvalds Date: Thu, 25 Jun 2009 18:23:37 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Tag: firefly_0821_release~13586 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a37f6b84c4f3d3ca61634a7b36bf64c6ea452271;p=firefly-linux-kernel-4.4.55.git Merge git://git./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() --- a37f6b84c4f3d3ca61634a7b36bf64c6ea452271