Merge branch 'linus' into x86/fixmap
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:21 +0000 (12:30 +0200)
1  2 
arch/x86/xen/enlighten.c

Simple merge