| commit | a2e71271535fde493c32803b1f34789f97efcb5e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Nov 04 11:54:15 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Nov 04 11:59:45 2009 +0100 |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d | |
| parent | 6d7aa9d721c8c640066142fd9534afcdf68d7f9d [diff] | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a [diff] |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>