tree eda9177a8d42324927424b3c42a99606ac6a4080
parent 96054569190bdec375fe824e48ca1f4e3b53dd36
parent 417484d47e115774745ef025bce712a102b6f86f
author Linus Torvalds <torvalds@linux-foundation.org> 1281720948 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281720948 -0700

Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, asm: Use a lower case name for the end macro in atomic64_386_32.S
  x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner
  x86: Document __phys_reloc_hide() usage in __pa_symbol()
  x86, apic: Map the local apic when parsing the MP table.