]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7384e302ee83a467231bef1d25cddf6ebe309283
treedff25f229ea115c8281819d224fbb18f851dc2b2
parenta262621b9ee90b455d0308365adab4522e8cd195
parenta3193917be559d121dfac641d7785a77ce544154
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: fix AMDC1E and XTOPOLOGY conflict in cpufeature
  x86: build fix