Merge tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next...
authorKevin Hilman <khilman@linaro.org>
Wed, 15 Jan 2014 00:17:41 +0000 (16:17 -0800)
committerKevin Hilman <khilman@linaro.org>
Wed, 15 Jan 2014 00:17:57 +0000 (16:17 -0800)
From Dinh Nguyen:
SOCFPGA DT updates for v3.14

* tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next:
  ARM: dts: socfpga: add pl330 clock
  ARM: dts: socfpga: update L2 tag and data latency

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Trivial merge