]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43b5804 584f761)
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)
* '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

1  2 
arch/x86/include/asm/cpufeature.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/entry_32.S patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge
diff --cc arch/x86/kernel/entry_32.S
Simple merge
Linux Kernel Source Tree.