Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 17:36:30 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 17:36:30 +0000 (10:36 -0700)
commit67d112842586aa11506b7a8afec29391bf8f3cca
treedff25f229ea115c8281819d224fbb18f851dc2b2
parentd3f15800d5752ca4814270180798ab8323157d28
parent2576c9991758e431b73e374f6019d6e1e12a8d36
Merge branch 'x86-fixes-for-linus' of git://git./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: fix AMDC1E and XTOPOLOGY conflict in cpufeature
  x86: build fix