From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Jul 2008 20:25:47 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.27-rc1~81
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9;p=linux-2.6-omap-h63xx.git

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 4d3702b6 (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)
---

a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9