| commit | 502adf5778f4151dcba3f64dd6ed322151f3712c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 24 12:21:49 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 24 12:21:49 2010 -0700 |
| tree | ad14adb37dedaefabdaf93b08ab9d32bc140ed81 | |
| parent | 3b6c5507a69861e80c26f21d04601c674cbeec3d [diff] | |
| parent | c6db67cda735d8ace5f19c3831240e1408679790 [diff] |
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