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>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
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>