Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen...
commit14c93e8eba70c3c85d8f8acc6cfdc728aef92076
authorIngo Molnar <mingo@elte.hu>
Wed, 23 Sep 2009 12:35:10 +0000 (23 14:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 23 Sep 2009 12:35:10 +0000 (23 14:35 +0200)
treed5575d386bca0237e91c0ec48be96925658005b7
parent14c0abf14a5e67e793131116bd97f57da37ccce3
parentc44c9ec0f38b939b3200436e3aa95c1aa83c41c7
Merge branch 'bugfix' of git://git./linux/kernel/git/jeremy/xen into x86/urgent
arch/x86/include/asm/pgtable_types.h
arch/x86/xen/enlighten.c