Merge remote-tracking branch 'lsk/v3.10/topic/clk-divider' into linux-linaro-lsk

diff --cc drivers/clk/clk-divider.c
Simple merge

diff --cc include/linux/clk-provider.h
Simple merge