diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-26 02:29:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-26 02:29:02 -0400 |
| commit | 35dce1a99d010f3d738af4ce1b9b77302fdfe69c (patch) | |
| tree | e34a37de965a79a2ae301de4d0557f500111dde6 /arch/x86/include/asm/numa_64.h | |
| parent | 7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f (diff) | |
| parent | 1c569f0264ea629c10bbab471dd0626ce4d3f19f (diff) | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Conflicts:
include/linux/tracepoint.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/numa_64.h')
0 files changed, 0 insertions, 0 deletions