Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 22:12:41 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 22:12:41 +0000 (15:12 -0700)
commit58f9b52ee8712283f7ffedb661df678c61e88a91
treefe6d2e1bca6befd8ca347487a7c053b8136320ad
parent2af170dd241810212cbdbdc802ba7d39e3fb23b9
parentc70878b4e0b6cf8d2f1e46319e48e821ef4a8aba
Merge ssh:///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
kernel/compat.c