]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 04ca2c1 45b86a9)
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)
commit09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2
tree9859b9ec3b5979af6b177155ef847f97fba19a6atree | snapshot
parent04ca2c17e3fae2d3f73aa5ad533242d556cadf5acommit | diff
parent45b86a96f17cb2900f291129b0e67287400e45b2commit | 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:
  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
Unnamed repository; edit this file 'description' to name the repository.