summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-10-29 15:21:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-10-29 15:21:30 +0000
commit116ef0fcc9268a876c8d1bbf77d8fa80111fa526 (patch)
tree95d1386dd5c7da2f1ef27e2aa4173824e6d93dc5 /kernel/time
parent9ffecb10283508260936b96022d4ee43a7798b4c (diff)
parent38850d786a799c3ff2de0dc1980902c3263698dc (diff)
parenta4283e41bbd80c629770f954cc5d013eb8851229 (diff)
downloadlinux-116ef0fcc9268a876c8d1bbf77d8fa80111fa526.tar.bz2
Merge branches 'fixes' and 'misc' into for-next