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)
commit502adf5778f4151dcba3f64dd6ed322151f3712c
treead14adb37dedaefabdaf93b08ab9d32bc140ed81
parent3b6c5507a69861e80c26f21d04601c674cbeec3d
parentc6db67cda735d8ace5f19c3831240e1408679790
Merge branch 'perf-fixes-for-linus' of git://git./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