From: Rafael J. Wysocki Date: Fri, 17 Jan 2014 00:56:56 +0000 (+0100) Subject: Merge branch 'pm-clk' X-Git-Tag: v3.14-rc1~107^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=380062bd66dc65287a3e9f937bc0dee2c434d25d;p=karo-tx-linux.git Merge branch 'pm-clk' * pm-clk: PM / clock_ops: report clock errors from clk_enable() PM / clock_ops: check return of clk_enable() in pm_clk_resume() PM / clock_ops: fix up clk prepare/unprepare count --- 380062bd66dc65287a3e9f937bc0dee2c434d25d