diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-15 07:29:44 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-15 07:29:44 (GMT) |
| commit | 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 (patch) | |
| tree | 7e5f6d050b72ab08a4497e82a4a103fefb086e80 /include/linux/perf_event.h | |
| parent | 56396e6823fe9b42fe9cf9403d6ed67756255f70 (diff) | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| download | linux-fsl-qoriq-8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2.tar.xz | |
Merge commit 'v2.6.38' into x86/mm
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: Resolve the conflict, update the branch to .38.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
0 files changed, 0 insertions, 0 deletions