projects / profile / ivi / kernel-adaptation-intel-automotive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52b8b8d 9e81509)
Merge branch 'x86/amd-nb' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:45:33 +0000 (09:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:45:47 +0000 (09:45 +0100)
commit275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092
tree785ce29ec09904fbde73c63e3aeadaf6537752a5tree | snapshot
parent52b8b8d7251f8f7b8ed4a6c623618106d83e18b5commit | diff
parent9e81509efc4fefcdd75cc6a4121672fa71ae8745commit | diff
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>
arch/x86/kernel/cpu/amd.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;