From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Dec 2010 23:39:40 +0000 (-0800)
Subject: Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=79534f237f05cac7f728cc957efdcc17603e38cd;p=linux.git

Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git./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 probe: Fix to support libdwfl older than 0.148
  perf tools: Fix lazy wildcard matching
  perf buildid-list: Fix error return for success
  perf buildid-cache: Fix symbolic link handling
  perf symbols: Stop using vmlinux files with no symbols
  perf probe: Fix use of kernel image path given by 'k' option

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, kexec: Limit the crashkernel address appropriately
---

79534f237f05cac7f728cc957efdcc17603e38cd