From: Linus Torvalds Date: Fri, 15 Nov 2013 05:17:43 +0000 (+0900) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c681427e5ca22925fcc1be76a2e260a11e0a8498;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git./linux/kernel/git/davem/ide Pull IDE updates from David Miller: "Just some minor cleanups and simplifications" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: ide: pmac: remove unnecessary pci_set_drvdata() ide: cs5536: use module_pci_driver() ide: pmac: Remove casting the return value which is a void pointer --- c681427e5ca22925fcc1be76a2e260a11e0a8498