commit | 66cd55d2b903643cbd019ef97a5305d9428d3865 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 16:24:17 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 16:24:17 2010 -0700 |
tree | 454a5af22b1aaf8fe62689974342a784f6f38822 | |
parent | 75cb5fdce29c77ec54db45f0c6be7cc5715f8e15 [diff] | |
parent | 3b770a2128423a687e6e9c57184a584fb4ba4c77 [diff] |
Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/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