From: Ingo Molnar Date: Mon, 2 Aug 2010 06:29:56 +0000 (+0200) Subject: Merge commit 'v2.6.35' into perf/core X-Git-Tag: v2.6.36-rc1~532^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01;p=pandora-kernel.git Merge commit 'v2.6.35' into perf/core Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream. Signed-off-by: Ingo Molnar --- 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 Reading git-diff-tree failed