Merge branch 'x86/apic-cleanups' into x86/numa
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Dec 2010 19:36:26 +0000 (11:36 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Dec 2010 19:36:26 +0000 (11:36 -0800)
commitd50e8fc7e38d88909448a723cb1f825bb3af30e2
tree099e969b273c3d180c89aa64b1e359ef66a9fc5d
parenta387e95a49743cf9835c5299ca549232618d8249
parent0aa002fe602939370e9476e5ec32b562000a0425
Merge branch 'x86/apic-cleanups' into x86/numa
arch/x86/mm/amdtopology_64.c