tree 01dae0e9458eea6289f78bd21cea056798e5c75e
parent 712a30e63c8066ed84385b12edbfb804f49cbc44
parent c289b074b66e2e59c65aba73f40b99e797e92d2f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202673765 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202673765 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  hrtimer: don't modify restart_block->fn in restart functions
  hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
  hrtimer: fix *rmtp handling in hrtimer_nanosleep()
  ntp: correct inconsistent interval/tick_length usage