From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jul 2016 20:29:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v6.1~16120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a81a8f2a5918956e214bb718099a89e500e7ec5;p=sdk%2Femulator%2Femulator-kernel.git

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

Pull IDE updates from David Miller:
 "Just a couple small bug fixes, nothing overly exciting in here"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: missing break statement in set_timings_mdma()
  ide: hpt366: fix incorrect mask when checking at cmd_high_time
  ide-tape: fix misprint in failure handling in idetape_init()
  cmd640: add __init attribute
---

1a81a8f2a5918956e214bb718099a89e500e7ec5