Merge branch 'x86/mem' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 18 May 2011 18:59:27 +0000 (20:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 May 2011 18:59:30 +0000 (20:59 +0200)
Merge reason: memcpy_64.S changes an assumption perf bench has, so merge this
              here so we can fix it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/alternative.c

Simple merge