Merge tag 'clk-mvebu-3.18' of git://git.infradead.org/linux-mvebu into clk-next

clock changes for mvebu for v3.18

 - correct timer drift caused by SSCG deviation
 - fix typo in comment

diff --cc drivers/clk/mvebu/common.c
Simple merge

diff --cc drivers/clk/mvebu/common.h
Simple merge