tree d9eba9e6a57ad9323268b6bc9a7e5516d18e9583
parent 388f997620cb57372c494a194e9698b28cc179b8
parent d681f1166919d6829083c069a83edcd59bfd5e34
author Linus Torvalds <torvalds@linux-foundation.org> 1429303019 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1429303019 -0400

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