]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb38f9b c9c024b)
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)
* '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


Trivial merge
Linux kernel for KaRo TX COM modules