Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Browse source

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

...

This commit is contained in:

Linus Torvalds 2016-03-28 15:17:02 -05:00

parent d4dc3b2442 0d7ef45cde

commit 1993b176a8

2 changed files with 3 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/ide/icside.c

View file

2

drivers/ide/palm_bk3710.c

View file