summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-15 09:51:19 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-15 09:51:24 +0100
commit0ffa798d947f5f5e40690cc9d38e678080a34f87 (patch)
treea9e25ba4431de513d4c83201429e9ff301cbaf50 /kernel
parent39dc78b6510323848e3356452f7dab9499736978 (diff)
parentc86e2eaded39843e1bf4f07d1adfab4494f20894 (diff)
parentc5659b74f052150791750234f92dcfb29d27efa5 (diff)
downloadlinux-0ffa798d947f5f5e40690cc9d38e678080a34f87.tar.gz
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
Merge reason: Both 'perf bench' and the pending PowerPC changes are now ready for the next merge window. Signed-off-by: Ingo Molnar <mingo@elte.hu>