tree 3cc0a80defb54d284e2a9a1e69b1224064921775
parent b3f2f6cd1ff935ecac9a5346904b899d7af689fe
parent 92af1abde4f2d74c9e5f7b670a1971779ed0b051
author Linus Torvalds <torvalds@linux-foundation.org> 1275248101 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275248101 -0700

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