From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2015 20:36:59 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v4.1-rc1~94
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=04b7fe6a4a231871ef681bc95e08fe66992f7b1f;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE update from David Miller:
 "Just one change, getting rid of usage of the deprecated PCI DMA
  interfaces in the IDE drivers"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: remove deprecated use of pci api
---

04b7fe6a4a231871ef681bc95e08fe66992f7b1f