]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
projects / users / griffoul / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19c3205 a97ad0c)
Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
authorJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:54:07 +0000 (18:54 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:54:07 +0000 (18:54 -0700)
Merge in the timekeeping changes that missed 3.12

Signed-off-by: John Stultz <john.stultz@linaro.org>
1  2 
kernel/time/clocksource.c patch | diff1 | diff2 | blob | history

diff --cc kernel/time/clocksource.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.