]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
authorChuck Anderson <chuck.anderson@oracle.com>
Thu, 27 Oct 2016 17:53:17 +0000 (10:53 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 27 Oct 2016 17:53:17 +0000 (10:53 -0700)
Conflicts:
arch/x86/xen/enlighten.c

1  2 
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/apic.c
arch/x86/xen/enlighten.c
drivers/block/xen-blkback/xenbus.c
drivers/net/xen-netback/xenbus.c
drivers/xen/Kconfig
drivers/xen/Makefile
kernel/sched/cputime.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge