From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Dec 2011 21:21:28 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.2-rc5~27
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=09d9673d53005fdf40de4c759425893904292236;p=linux.git

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
---

09d9673d53005fdf40de4c759425893904292236