Merge branches 'cpuidle', 'fixes' and 'misc' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 28 Jul 2016 14:28:11 +0000 (15:28 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Thu, 28 Jul 2016 14:28:11 +0000 (15:28 +0100)

Trivial merge