You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ingo Molnar 365d46dc9b Merge branch 'linus' into x86/xen ... Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/process_64.c arch/x86/xen/enlighten.c		17 years ago
..
events.h	x86: consolidate header guards	17 years ago
grant_table.h	x86: consolidate header guards	17 years ago
hypercall.h	x86: consolidate header guards	17 years ago
hypervisor.h	Merge branch 'linus' into x86/xen	17 years ago
interface.h	x86: consolidate header guards	17 years ago
interface_32.h	x86: consolidate header guards	17 years ago
interface_64.h	x86: consolidate header guards	17 years ago
page.h	Merge branch 'linus' into x86/header-guards	17 years ago