Merge branch 'linus' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:21:27 +0000 (11:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:21:27 +0000 (11:21 +0200)
commit688d22e23ab1caacb2c36c615854294b58f2ea47
tree95c8163c0b1f56902f5537bc256d7e5507f56cee
parent7e0edc1bc343231029084761ebf59e522902eb49
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/xen
arch/x86/xen/mmu.c
arch/x86/xen/time.c
include/linux/page-flags.h