From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 15:05:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Tag: firefly_0821_release~9833^2~2023
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e125f7b9cbfce4101191b8076d606c517a73066;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:
  cmd640: fix kernel oops in test_irq() method
  pdc202xx_old: ignore "FIFO empty" bit in test_irq() method
  pdc202xx_old: wire test_irq() method for PDC2026x
  IDE: pass IRQ flags to the IDE core
  ide: fix comment typo in ide.h
---

7e125f7b9cbfce4101191b8076d606c517a73066