Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2009 01:17:22 +0000 (18:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2009 01:17:22 +0000 (18:17 -0700)
commit9f76208c33984ab777eace5d07a4e36e88703e02
tree2a73304a846ab41ee5366deb6ea511af7ebfbec1
parentd06be221504189f38950111c214802ada0eb1b71
parent557055bebe9212dfa6b9f5df811dfd0dac77ec55
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