| commit | b3f2caaaa82440af06b39c2c92e4fa8122d75465 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 11 08:22:26 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 11 08:22:26 2009 -0800 |
| tree | 62338ae23ff00ec98773a1a9d768a303740a4dfa | |
| parent | 93431dd7afa908292753acccb68785efaa366f5b [diff] | |
| parent | f47a454db9129d2e61b224a40f4365cdd4f83042 [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: tracing, x86: fix constraint for parent variable tracing, x86: fix fixup section to return to original code profiling: fix broken profiling regression