Merge branch 'merge' into powerpc-next
[linux-2.6] / include / xen / page.h
1 #include <asm/xen/page.h>