Merge branch 'clk-ti' into clk-next

* clk-ti:
  clk: Remove CLK_IS_BASIC clk flag
  clk: ti: dra7: disable the RNG and TIMER12 clkctrl clocks on HS devices
  clk: ti: dra7x: prevent non-existing clkctrl clocks from registering
  ARM: omap2+: hwmod: drop CLK_IS_BASIC flag usage
  clk: ti: export the omap2_clk_is_hw_omap call

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

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

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

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

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

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