From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2009 01:17:22 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f76208c33984ab777eace5d07a4e36e88703e02;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'tracing-fixes-for-linus' of git://git./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: Fix branch tracer header
  tracing: Fix power tracer header
---

9f76208c33984ab777eace5d07a4e36e88703e02