Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2015 20:36:59 +0000 (16:36 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2015 20:36:59 +0000 (16:36 -0400)
commit04b7fe6a4a231871ef681bc95e08fe66992f7b1f
treed9eba9e6a57ad9323268b6bc9a7e5516d18e9583
parent388f997620cb57372c494a194e9698b28cc179b8
parentd681f1166919d6829083c069a83edcd59bfd5e34
Merge git://git./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