projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6250a3 e2b34e3)
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 19:40:40 +0000 (21:40 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2012 19:40:40 +0000 (21:40 +0200)
Merge in Linus's tree to avoid a conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/alternative.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/alternative.c
Simple merge
Domain: System / Uncategorized;