tree 508e57a9d2e91228362f4b071607bba08ad7e160
parent e7e6d2a4a1aecb087c0f522d8d131a0252691398
parent 39025ba38278f3003ee538409f7c98970620ef49
author Linus Torvalds <torvalds@linux-foundation.org> 1399064692 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1399064692 -0700

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

Pull x86 fixes from Peter Anvin:
 "Two very small changes: one fix for the vSMP Foundation platform, and
  one to help LLVM not choke on options it doesn't understand (although
  it probably should)"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vsmp: Fix irq routing
  x86: LLVMLinux: Wrap -mno-80387 with cc-option