]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 21:21:28 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 21:21:28 +0000 (13:21 -0800)
commit09d9673d53005fdf40de4c759425893904292236
tree0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5
parentfb38f9b8fe98a9c1f6b1e57d1b08b1102b293929
parentc9c024b3f3e07d087974db4c0dc46217fff3a6c0
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