pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 25258ef 83097ac)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
commit	e4f807c2b4d81636fc63993368646c5bfd42b22f
tree	2ff100911b1ba4e26e3d9aad41edb9b48405f01e	tree \| snapshot
parent	25258ef762bc4a05fa9c4523f7dae56e3fd01864	commit \| diff
parent	83097aca8567a0bd593534853b71fe0fa9a75d69	commit \| diff

Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/paravirt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/asm-x86/xen/hypervisor.h

Unnamed repository; edit this file 'description' to name the repository.