Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen...
Ingo Molnar [Wed, 23 Sep 2009 12:35:10 +0000 (14:35 +0200)]
1  2 
arch/x86/include/asm/pgtable_types.h
arch/x86/xen/enlighten.c

Simple merge
Simple merge