From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jul 2014 05:44:24 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v4.14-rc1~7189
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14867719611278380c96213873066237b2758f3f;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/ide

Pull IDE fixes from David Miller:
 - fix interrupt registry for some Atari IDE chipsets.
 - adjust Kconfig dependencies for x86_32 specific chips.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: Fix SC1200 dependencies
  ide: Fix CS5520 and CS5530 dependencies
  m68k/atari - ide: do not register interrupt if host->get_lock is set
---

14867719611278380c96213873066237b2758f3f