Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2016 20:28:57 +0000 (12:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2016 20:28:57 +0000 (12:28 -0800)
commit7f36f1b2a8c4f55f8226ed6c8bb4ed6de11c4015
tree3d6f138321ce8c1fbf227498d9e4dc9181caafa0
parentc38dec71664dadb15094151f53886abb69f8f9e6
parente04a2bd6d8c95608cbb2c803ee2875cebfd89f52
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