summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 09:58:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 09:58:50 -0700
commitf9db6e095115f9411b9647bdb9d81fe11f3d8b54 (patch)
tree243cdffd9c49dffb909d17ec24614d93f527cc8b /kernel/timer.c
parent3f27c0d2a469673e0f1efc8004b6f42428aa5b94 (diff)
parentc81fc2c331b8514ad112054cd2d87e6ec132286b (diff)
Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clockevent: export register_device and delta2ns clockevents: tick_broadcast_device can become static
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions