]> 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>
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)
commit9bdda6c3a367c59f0b04f63eb399ab57ed1b5412
treef437ed0a2f21386edee1886e8e6fd2f8f230c094
parent2d5dead72a3525e9b072875dbf6bdcc005605864
parent4e0e484358d88e9677eeefebcd70d18c5403e090
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

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