summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-18 11:24:41 +0200
committerIngo Molnar <mingo@kernel.org>2012-07-18 11:25:55 +0200
commiteec19d1a0d04c80e66eef634f7b8f460f2ca5643 (patch)
treee68f24938d458fc776b76dc6037f9a2d03f09403 /kernel/timer.c
parenttime: Rework timekeeping functions to take timekeeper ptr as argument (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-eec19d1a0d04c80e66eef634f7b8f460f2ca5643.tar.xz
linux-eec19d1a0d04c80e66eef634f7b8f460f2ca5643.zip
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions