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)
commit01ed58abec07633791f03684b937a7e22e00c9bb
tree7bb5b60c102aa08e404928ffcb3edf1e8404b5a2
parentaf2d03d4aaa847ef41a229dfee098a47908437c6
parent26afb7c661080ae3f1f13ddf7f0c58c4f931c22b
Merge branch 'x86/mem' into perf/core

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>
arch/x86/kernel/alternative.c