From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2014 02:07:15 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: firefly_0821_release~176^2~4537
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3308ee8f4582f97d1c08864dd06f7291aea323e5;p=firefly-linux-kernel-4.4.55.git

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

Pull IDE fixes from David Miller:
 "Two header file inclusion fixes from Rashika Kheria"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers: ide: Include appropriate header file in ide-pio-blacklist.c
  drivers: ide: Include appropriate header file in ide-cd_verbose.c
---

3308ee8f4582f97d1c08864dd06f7291aea323e5