Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next: (52 commits) xen: add balloon driver xen: allow compilation with non-flat memory xen: fold xen_sysexit into xen_iret xen: allow set_pte_at on init_mm to be lockless xen: disable preemption during tlb flush xen pvfb: Para-virtual framebuffer, keyboard and pointer driver xen: Add compatibility aliases for frontend drivers xen: Module autoprobing support for frontend drivers xen blkfront: Delay wait for block devices until after the disk is added xen/blkfront: use bdget_disk xen: Make xen-blkfront write its protocol ABI to xenstore xen: import arch generic part of xencomm xen: make grant table arch portable xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one xen: make include/xen/page.h portable moving those definitions under asm dir xen: add resend_irq_on_evtchn() definition into events.c Xen: make events.c portable for ia64/xen support xen: move events.c to drivers/xen for IA64/Xen support xen: move features.c from arch/x86/xen/features.c to drivers/xen xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs ...
Showing
arch/x86/mm/pgtable.c
0 → 100644
arch/x86/xen/grant-table.c
0 → 100644
drivers/input/xen-kbdfront.c
0 → 100644
drivers/video/xen-fbfront.c
0 → 100644
drivers/xen/Kconfig
0 → 100644
drivers/xen/balloon.c
0 → 100644
drivers/xen/xencomm.c
0 → 100644
include/asm-x86/pgalloc_32.h
已删除
100644 → 0
include/asm-x86/pgalloc_64.h
已删除
100644 → 0
include/asm-x86/xen/events.h
0 → 100644
include/asm-x86/xen/grant_table.h
0 → 100644
include/asm-x86/xen/page.h
0 → 100644
include/xen/balloon.h
0 → 100644
include/xen/interface/callback.h
0 → 100644
include/xen/interface/io/fbif.h
0 → 100644
include/xen/interface/io/kbdif.h
0 → 100644
include/xen/interface/xencomm.h
0 → 100644
此差异已折叠。
此差异已折叠。
include/xen/xen-ops.h
0 → 100644
此差异已折叠。
include/xen/xencomm.h
0 → 100644
此差异已折叠。
想要评论请 注册 或 登录