| commit | 72b51a6b4d803381f16d819df392dd1efd1c7181 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 18 08:06:35 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 18 08:06:35 2008 -0800 |
| tree | 7e27a03c10cb2f5e6593dd599b3c8b0bcd0f9ee9 | |
| parent | 8c60bfb0666952728b3be73ef9bc133d686aebba [diff] | |
| parent | e270219f4372b58bd3eeac12bd9f7edc592b8f6b [diff] |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kernel/profile.c: fix section mismatch warning function tracing: fix wrong pos computing when read buffer has been fulfilled tracing: fix mmiotrace resizing crash ring-buffer: no preempt for sched_clock() ring-buffer: buffer record on/off switch