Merge branch 'clk-next-s3c64xx-delta' into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 27 Aug 2013 23:20:35 +0000 (16:20 -0700)
committerMike Turquette <mturquette@linaro.org>
Tue, 27 Aug 2013 23:20:35 +0000 (16:20 -0700)

Trivial merge