From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2010 23:24:17 +0000 (-0700)
Subject: Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=66cd55d2b903643cbd019ef97a5305d9428d3865;p=linux-beck.git

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
---

66cd55d2b903643cbd019ef97a5305d9428d3865