From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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: v2.6.24-rc1~288
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f9b52ee8712283f7ffedb661df678c61e88a91;p=linux-2.6

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