From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Mar 2015 20:16:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: firefly_0821_release~176^2~2137
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a93fc153b1485120ee0abd9bfcae38460e6c00e6;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/ide

Pull IDE fix from David Miller:
 "Just one fix to convert a by-hand conversion of jiffies to msecs, from
  Nicholas McGuire"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide_tape: convert jiffies with jiffies_to_msecs
---

a93fc153b1485120ee0abd9bfcae38460e6c00e6