]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/sh/kernel/cpu/sh4a/setup-sh7780.c
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 May 2010 19:35:01 +0000 (12:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 May 2010 19:35:01 +0000 (12:35 -0700)
commitbc7d352c5e76c74c628a39b99777a1bdddde5e81
tree3cc0a80defb54d284e2a9a1e69b1224064921775
parentb3f2f6cd1ff935ecac9a5346904b899d7af689fe
parent92af1abde4f2d74c9e5f7b670a1971779ed0b051
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tui: Fix last use_browser problem related to .perfconfig
  perf symbols: Add the build id cache to the vmlinux path
  perf tui: Reset use_browser if stdout is not a tty
  ring-buffer: Move zeroing out excess in page to ring buffer code
  ring-buffer: Reset "real_end" when page is filled
kernel/trace/trace.c