Merge branch 'x86/numa' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 10 Jan 2011 08:35:57 +0000 (09:35 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 10 Jan 2011 08:36:07 +0000 (09:36 +0100)
commit9adcc4a127be6c979eae1ae34083261f2ec5dfec
tree93652985f5dc4c0e38fda60dd03fca2583932094
parent30285c6f03be05f6f894b50d03bcb638886e3936
parentd906f0eb2f0e6d1a24c479f69a9c39e7e45c5ae8
Merge branch 'x86/numa' into x86/urgent

Merge reason: Topic is ready for upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/srat_64.c