]> git.baikalelectronics.ru Git - 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, 11 Nov 2008 18:51:50 +0000 (10:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Nov 2008 18:51:50 +0000 (10:51 -0800)
commit0552dba5f3b4a47a9e781013fc9aeea5866268a0
tree9859b9ec3b5979af6b177155ef847f97fba19a6a
parentd54969e4238bb34394e93313dca4b10aa71401cf
parent7c483d77b40a056c257d6fa8be47b42633d783ec
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:
  ring-buffer: prevent infinite looping on time stamping
  ftrace: disable tracing on resize
  ftrace: fix breakage in bin_fmt results
  ftrace: ftrace.txt version update
  ftrace: update txt document