tree 94b6c8ca6cf571faff5103117cf3030ded62d49f
parent 2cc499b398c7bbcbf415017cd9588e699e04cd64
parent abb2bafd295fe962bbadc329dbfb2146457283ac
author Linus Torvalds <torvalds@linux-foundation.org> 1468442018 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1468442018 +0900

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

Pull x86 fixes from Ingo Molnar:
 "This contains three commits to fix memory corruption bugs with certain
  Apple AirPort cards, plus a fix for a X86_BUG() ID definitions collision
  bug in asm/cpufeatures.h"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/quirks: Add early quirk to reset Apple AirPort card
  x86/quirks: Reintroduce scanning of secondary buses
  x86/quirks: Apply nvidia_bugs quirk only on root bus
  x86/cpu: Fix duplicated X86_BUG(9) macro