From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Oct 2010 22:02:41 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.36-rc7~21
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f4a3330d76b17239fb34a99d54692248c2d0468c;hp=-c;p=net-next-2.6.git

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
---

f4a3330d76b17239fb34a99d54692248c2d0468c