diff options
| author | Ingo Molnar | 2009-11-04 11:54:15 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-11-04 11:59:45 +0100 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /Documentation/crypto/descore-readme.txt | |
| parent | perf symbols: Initialize dso->loaded (diff) | |
| parent | Linux 2.6.32-rc6 (diff) | |
| download | kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.tar.gz kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.tar.xz kernel-qcow2-linux-a2e71271535fde493c32803b1f34789f97efcb5e.zip | |
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>
Diffstat (limited to 'Documentation/crypto/descore-readme.txt')
0 files changed, 0 insertions, 0 deletions