tree 3ee00d0259b0f1c9f70784a835522365246ce7c0
parent 86505fc06b6f1ee8a13473053a41ed01948e2d4f
parent d4f8c2e0f827a0b3a322c449ac331ae41feeb359
author Linus Torvalds <torvalds@linux-foundation.org> 1469824146 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1469824146 -0700

Merge git://git.kernel.org/pub/scm/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