summaryrefslogtreecommitdiff
path: root/arch/score
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-16 08:45:33 (GMT)
committerIngo Molnar <mingo@elte.hu>2011-02-16 08:45:47 (GMT)
commit275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 (patch)
tree785ce29ec09904fbde73c63e3aeadaf6537752a5 /arch/score
parent52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (diff)
parent9e81509efc4fefcdd75cc6a4121672fa71ae8745 (diff)
downloadlinux-fsl-qoriq-275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092.tar.xz
Merge branch 'x86/amd-nb' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts with ongoing NUMA work. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions