From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2016 20:17:02 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v4.6-rc2~28
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/1993b176a8224e371e0732ffada7ab9eb3b0912b

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE fixes from David Miller:
 "Just two small changes:

  1) Remove bogus init annotation in icside, from Arnd Bergmann.

  2) Don't use zero clock rates in palm_bk3710 driver, from Wolfram
     Sang"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: palm_bk3710: test clock rate to avoid division by 0
  ide: icside: remove incorrect initconst annotation
---

1993b176a8224e371e0732ffada7ab9eb3b0912b