]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'v3.8-rc7' into x86/asm
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Feb 2013 23:47:45 +0000 (15:47 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Feb 2013 23:47:45 +0000 (15:47 -0800)
Merge in the updates to head_32.S from the previous urgent branch, as
upcoming patches will make further changes.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1  2 
arch/x86/Kconfig

Simple merge