]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2af170d c70878b)
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)
* 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

1  2 
kernel/compat.c patch | diff1 | diff2 | blob | history

diff --cc kernel/compat.c
Simple merge
Linux 2.6 source tree