git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dba8614 38aef31)
Merge branch 'fortglx/3.14/time' of git://git.linaro.org/people/john.stultz/linux...
authorIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:13:31 +0000 (14:13 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:13:31 +0000 (14:13 +0100)
Pull timekeeping updates from John Stultz.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/time/tick-common.c patch | diff1 | diff2 | blob | history
kernel/time/tick-sched.c patch | diff1 | diff2 | blob | history
kernel/time/timekeeping.c patch | diff1 | diff2 | blob | history

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