Merge branches 'fixes' and 'misc' into for-next

2015-10-29 15:21:30 +00:00 · 2015-10-29 15:21:30 +00:00 · 116ef0fcc9
commit 116ef0fcc9
parent 9ffecb1028 38850d786a a4283e41bb
28 changed files with 143 additions and 162 deletions
--- a/Documentation/devicetree/bindings/arm/twd.txt
+++ b/Documentation/devicetree/bindings/arm/twd.txt
@ -19,6 +19,11 @@ interrupts.
 - reg : Specify the base address and the size of the TWD timer
 	register window.

+Optional
+
+- always-on : a boolean property. If present, the timer is powered through
+  an always-on power domain, therefore it never loses context.
+
 Example:

 	twd-timer@2c000600 {