summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-07-28 17:28:11 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2016-07-28 17:28:11 +0300
commit5f5a00eaa1ddd3754963e077ff514ded9fc88b7a (patch)
tree6926b8ebe6e1148706b65565664862e7133dbbcb /arch
parentc3fbbf9308cc939663fdfb90334fe344947dd645 (diff)
parentf6492164ecb19d43687875fdb456845acc504590 (diff)
parent565068221b90573d0a4ac3e73f1aa960f5571b84 (diff)
downloadlinux-5f5a00eaa1ddd3754963e077ff514ded9fc88b7a.tar.xz
Merge branches 'cpuidle', 'fixes' and 'misc' into for-linus