summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-23 15:39:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-23 15:39:40 -0800
commit79534f237f05cac7f728cc957efdcc17603e38cd (patch)
tree1eb7456d8ffa9f0adcd5ef9b7d239de4f8df4a47
parent3fc5e98d8cf85e0d77fc597b49e9268dff67400e (diff)
parent2ce494a3dac331fdbb2590e5fa0598956dd21b8b (diff)
parent7f8595bfacef279f06c82ec98d420ef54f2537e0 (diff)
downloadlinux-sh-79534f237f05cac7f728cc957efdcc17603e38cd.tar.gz
Merge branches 'perf-fixes-for-linus' and 'x86-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 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