Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Tue, 22 Dec 2015 18:34:10 +0000 (10:34 -0800)
committerMichael Turquette <mturquette@baylibre.com>
Tue, 22 Dec 2015 19:57:35 +0000 (11:57 -0800)

Trivial merge