]> err.no Git - linux-2.6/commitdiff
Merge branch 'x86/crashdump' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 15:19:02 +0000 (17:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 15:19:02 +0000 (17:19 +0200)
1  2 
arch/x86/kernel/setup.c

Simple merge