tree 0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5
parent fb38f9b8fe98a9c1f6b1e57d1b08b1102b293929
parent c9c024b3f3e07d087974db4c0dc46217fff3a6c0
author Linus Torvalds <torvalds@linux-foundation.org> 1323379288 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323379288 -0800

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimers: Fix time comparison
  ptp: Fix clock_getres() implementation