| commit | 09d9673d53005fdf40de4c759425893904292236 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 08 13:21:28 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 08 13:21:28 2011 -0800 |
| tree | 0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5 | |
| parent | fb38f9b8fe98a9c1f6b1e57d1b08b1102b293929 [diff] | |
| parent | c9c024b3f3e07d087974db4c0dc46217fff3a6c0 [diff] |
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