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)
commitb8f15e711904712e71d2aac3241f9669d0b62917
treee44d2f1b0fdf7068df8d52318c1e74f7e3020468
parent4ef7675344d687a0ef5b0d7c0cee12da005870c0
parentfcd5ac1a4137aea367f6a41399a15e7cef1c0841
Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next