aboutsummaryrefslogtreecommitdiff
path: root/include/acpi/acpi_numa.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-10 12:46:28 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-10 12:46:51 +0200
commit1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch)
treeec5af7a70f58ad27ad21fc27815ca164ccf92c36 /include/acpi/acpi_numa.h
parentdcef788eb9659b61a2110284fcce3ca6e63480d2 (diff)
parent93cfb3c9fd83d877a8f1ffad9ff862b617b32828 (diff)
Merge branch 'tracing/urgent' into tracing/core
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes] and pick up the current lineup of tracing/urgent fixes as well Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/acpi_numa.h')
0 files changed, 0 insertions, 0 deletions