projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 916f676 4db70f7)
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:51:31 +0000 (13:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 11:51:35 +0000 (13:51 +0200)
Merge reason: we want to queue up a dependent patch.

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

diff --cc arch/x86/kernel/setup.c
Simple merge