Merge tag 'arm-perf-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 20:24:51 +0000 (13:24 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 20:25:14 +0000 (13:25 -0700)
commite85923acb94b518c3b7bfad407cf93ee964ba27f
treeabb54b24befe61783aa95de0a92bce16db29a5a5
parent0397bb85b53b73796e81aaa3f4114403a2b1236d
parentfee4f2c66a3b0f0e97e16b3084e8c4151ae9196f
Merge tag 'arm-perf-3.13' of git://git./linux/kernel/git/will/linux into next/drivers

From Will Deacon:
Addition of an ARM PMU driver for the CCI-400 coherent interconnect
found on big.LITTLE systems, such as TC2.

This was originally sent for 3.12, but the device-tree bindings hadn't
settled down so here's the improved version for 3.13. I think the code
has benefited from the wait.

* tag 'arm-perf-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  drivers: CCI: fix the error handle in cci_pmu_probe()
  drivers: CCI: add ARM CCI PMU support
  ARM: dts: Document the CCI PMU DT bindings
  ARM: dts: Improve CCI bindings documentation

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