]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:47:59 +0000 (19:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:47:59 +0000 (19:47 -0800)
commit627a9a194d6b29d345d99ef806171395bc6e3e38
treecb75dd1c5ef64cfe68c75e3299233d016ce23655
parent3d8b4bdef7e7c9d36ce90e563788c10051a91c34
parenta9bb18f36c8056f0712fb28c52c0f85d98438dfb
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