Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jan 2014 02:07:15 +0000 (18:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jan 2014 02:07:15 +0000 (18:07 -0800)
commit3308ee8f4582f97d1c08864dd06f7291aea323e5
treeaa58ea6357b174633706e75aa94ddf4d882a7824
parent13293115d1c44df1077976473112d18f1877c390
parent61eae5bb06496a6633ba000a1d7546b494e00081
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