Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:24:17 +0000 (16:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:24:17 +0000 (16:24 -0700)
commit66cd55d2b903643cbd019ef97a5305d9428d3865
tree454a5af22b1aaf8fe62689974342a784f6f38822
parent75cb5fdce29c77ec54db45f0c6be7cc5715f8e15
parent3b770a2128423a687e6e9c57184a584fb4ba4c77
Merge branch 'x86-alternatives-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, alternatives: BUG on encountering an invalid CPU feature number
  x86, alternatives: Fix one more open-coded 8-bit alternative number
  x86, alternatives: Use 16-bit numbers for cpufeature index
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/entry_32.S