From: Linus Torvalds 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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=04b7fe6a4a231871ef681bc95e08fe66992f7b1f;p=openwrt%2Fstaging%2Fblogic.git 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 --- 04b7fe6a4a231871ef681bc95e08fe66992f7b1f