diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-03 20:17:55 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-03 20:17:55 +0400 |
| commit | 22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d (patch) | |
| tree | 9981477f6f9e4527a9598e636d0ffc7705a322a4 /arch/s390/lib | |
| parent | 70a7c1271e2bfca8ad2bf71f44c516ea2763b9ed (diff) | |
| parent | 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 (diff) | |
| download | linux-22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/lib')
0 files changed, 0 insertions, 0 deletions