projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b44d50d e2b34e3)
Merge branch 'linus' into timers/urgent
authorIngo Molnar <mingo@kernel.org>
Tue, 31 Jul 2012 15:05:27 +0000 (17:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 31 Jul 2012 15:05:27 +0000 (17:05 +0200)
Merge in Linus's branch which already has timers/core merged.

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

diff --cc kernel/time/timekeeping.c
Simple merge
Domain: System / Kernel;