From: Linus Torvalds Date: Sun, 10 Feb 2008 20:02:45 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt X-Git-Tag: v2.6.25-rc1~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58a14ee9c49aa2b9742c56a0477666335368e05e;p=linux-2.6-omap-h63xx.git 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 --- 58a14ee9c49aa2b9742c56a0477666335368e05e