]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 19:21:49 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 19:21:49 +0000 (12:21 -0700)
commit8a3d90a2df001b80fba841363d89d806ebdc5d77
treead14adb37dedaefabdaf93b08ab9d32bc140ed81
parent2d55c64cf8c748cc326fc5e6a0e58912bd102664
parent37e929cc396a09826dd691d158d38e0809a8ea16
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  watchdog: Don't throttle the watchdog
  tracing: Fix timer tracing