Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:40:29 +0000 (21:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 05:40:29 +0000 (21:40 -0800)
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  time: catch xtime_nsec underflows and fix them
  posix-cpu-timers: fix clock_gettime with CLOCK_PROCESS_CPUTIME_ID


Trivial merge