Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

2014-06-05 12:35:52 +01:00 · 2014-06-05 12:35:52 +01:00 · 1fb333489f
commit 1fb333489f
parent 20e7e36433 3f8517e793 8ef418c717 1c2f87c225
135 changed files with 2173 additions and 1546 deletions
--- a/Documentation/devicetree/bindings/arm/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/pmu.txt
@ -8,6 +8,7 @@ Required properties:

 - compatible : should be one of
 	"arm,armv8-pmuv3"
+	"arm,cortex-a17-pmu"
 	"arm,cortex-a15-pmu"
 	"arm,cortex-a12-pmu"
 	"arm,cortex-a9-pmu"