From: Ingo Molnar Date: Sat, 14 Apr 2012 11:18:27 +0000 (+0200) Subject: Merge branch 'perf/core' into perf/uprobes X-Git-Tag: v3.5-rc1~102^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e;p=pandora-kernel.git Merge branch 'perf/core' into perf/uprobes Merge in latest upstream (and the latest perf development tree), to prepare for tooling changes, and also to pick up v3.4 MM changes that the uprobes code needs to take care of. Signed-off-by: Ingo Molnar --- 6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e Reading git-diff-tree failed