]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jul 2016 20:29:06 +0000 (13:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jul 2016 20:29:06 +0000 (13:29 -0700)
commita36a66a9a11d272ffc8432a6c34848f6f41b1b7c
tree3ee00d0259b0f1c9f70784a835522365246ce7c0
parentf991b844706b744c96ef19b27aaa0debe133b3f0
parentba52c84ae8ab364648aa1a51f374637d0c6ff8ab
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