]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
commit14e4da7493faab8e3b9c7b35e773e0e456035aaf
treece21e3712661adda661ba68904769075b9cb43e1
parent5df515c04ee253cea64c302895b115e9fa3d597d
parent7ed7c3551661e0f09cf6c476f30b2160232cc83d
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

Conflicts:
arch/x86/xen/enlighten.c
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