| commit | 627a9a194d6b29d345d99ef806171395bc6e3e38 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:47:59 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:47:59 2010 -0800 |
| tree | cb75dd1c5ef64cfe68c75e3299233d016ce23655 | |
| parent | 3d8b4bdef7e7c9d36ce90e563788c10051a91c34 [diff] | |
| parent | a9bb18f36c8056f0712fb28c52c0f85d98438dfb [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/kprobes: Fix probe parsing tracing: Fix circular dead lock in stack trace