Merge remote branch 'linus/master' into x86/cpu
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 28 Jul 2010 20:11:28 +0000 (13:11 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 28 Jul 2010 20:11:28 +0000 (13:11 -0700)
commit7d50d07da23995a18ac449636cb42aec2cb2808d
tree0ddf940a5e9ddc5eeebc996601d7fee3c36ab836
parent2decb194e65ab66eaf787512dc572cdc99893b24
parent6aa033d7efb85830535bb83cf6713d6025ae6e59
Merge remote branch 'linus/master' into x86/cpu
arch/x86/include/asm/msr-index.h