Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
commit58a14ee9c49aa2b9742c56a0477666335368e05e
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 10 Feb 2008 20:02:45 +0000 (10 12:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 10 Feb 2008 20:02:45 +0000 (10 12:02 -0800)
tree01dae0e9458eea6289f78bd21cea056798e5c75e
parent712a30e63c8066ed84385b12edbfb804f49cbc44
parentc289b074b66e2e59c65aba73f40b99e797e92d2f
Merge git://git./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