Merge branch 'linus' into x86/xen
Ingo Molnar [Mon, 16 Jun 2008 09:21:27 +0000 (11:21 +0200)]
1  2 
arch/x86/xen/mmu.c
arch/x86/xen/time.c
include/linux/page-flags.h

Simple merge
Simple merge
Simple merge