Merge commit 'f17a0dd1c2e0' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Fri, 17 Jun 2016 05:07:08 +0000 (22:07 -0700)
committerMichael Turquette <mturquette@baylibre.com>
Fri, 17 Jun 2016 05:07:08 +0000 (22:07 -0700)
1  2 
drivers/clk/clk.c

Simple merge