From: Linus Torvalds Date: Thu, 18 Oct 2007 22:12:41 +0000 (-0700) Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt X-Git-Tag: v6.6-pxa1908~49968 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=58f9b52ee8712283f7ffedb661df678c61e88a91;p=linux.git Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: hrtimer: hook compat_sys_nanosleep up to high res timer code hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier --- 58f9b52ee8712283f7ffedb661df678c61e88a91