projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4dc3b2 0d7ef45)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2016 20:17:02 +0000 (15:17 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2016 20:17:02 +0000 (15:17 -0500)
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


Trivial merge
Linux 6.x block layer and io_uring tree(s)