]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into xen-64bit
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:57:20 +0000 (23:57 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:57:20 +0000 (23:57 +0200)
1  2 
arch/x86/kernel/setup.c

Simple merge