From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jan 2016 20:28:57 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f36f1b2a8c4f55f8226ed6c8bb4ed6de11c4015;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 a few small changes this merge window, marking ops const, printf
  string type fixes, etc"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers/ide: make ide-scan-pci.c driver explicitly non-modular
  ide: constify ide_dma_ops structures
  ide: silence some underflow warnings
---

7f36f1b2a8c4f55f8226ed6c8bb4ed6de11c4015