tree fe6d2e1bca6befd8ca347487a7c053b8136320ad
parent 2af170dd241810212cbdbdc802ba7d39e3fb23b9
parent c70878b4e0b6cf8d2f1e46319e48e821ef4a8aba
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192745561 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192745561 -0700

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