tree 0a01c408fc2d58fbab7b6bcb0ce93933e4862f31
parent 57cf4f78c6266d5a6e5de5485065d4015b84bb30
parent 021989622810b02aab4b24f91e1f5ada2b654579
author Linus Torvalds <torvalds@linux-foundation.org> 1285970561 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285970561 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hpet: Fix bogus error check in hpet_assign_irq()
  x86, irq: Plug memory leak in sparse irq
  x86, cpu: After uncapping CPUID, re-run CPU feature detection