tree 243cdffd9c49dffb909d17ec24614d93f527cc8b
parent 3f27c0d2a469673e0f1efc8004b6f42428aa5b94
parent c81fc2c331b8514ad112054cd2d87e6ec132286b
author Linus Torvalds <torvalds@linux-foundation.org> 1245085130 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245085130 -0700

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