tree 1051c0dbd14bcd05b9a17a08b6af1f25b0a9c0d6
parent 46ac0cc92eedf92f7909e563ffcd2dbc4b914bc3
parent f82c3d71d6fd2e6a3e3416f09099e29087e39abf
author Linus Torvalds <torvalds@linux-foundation.org> 1279570772 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279570772 -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, pci, mrst: Add extra sanity check in walking the PCI extended cap chain
  x86: Fix x2apic preenabled system with kexec
  x86: Force HPET readback_cmp for all ATI chipsets