From: Linus Torvalds Date: Sun, 19 Nov 2017 18:04:41 +0000 (-1000) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide X-Git-Tag: 4.15-smb3-updates~30 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=ed30b147e1f6e396e70a52dbb6c7d66befedd786;hp=-c Merge git://git./linux/kernel/git/davem/ide Pull small IDE cleanup from David Miller. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: PNP: ide: constify pnp_device_id --- ed30b147e1f6e396e70a52dbb6c7d66befedd786