]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a47ea22 48e4570)
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 20:25:47 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 20:25:47 +0000 (13:25 -0700)
commit0b5e6319c5635a5d0c8e914c6682c9fa0e14071d
tree8edfb5bd152aef0d48c4a165247906db347c3a56tree | snapshot
parenta47ea223b6bdbe0a893b02d3f877debd00400202commit | diff
parent48e4570b7c0bb7b2dcd05486ce9a4a40bdb25919commit | 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:
  ftrace: fix modular build
  ftrace: disable tracing on acpi idle calls
  ftrace: remove latency-tracer leftover
  ftrace: only trace preempt off with preempt tracer
  ftrace: fix 6a49afcf (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)
Linux Kernel Source Tree.