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

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/net/xen-netback/xenbus.c
Simple merge

diff --cc drivers/xen/Kconfig
Simple merge

diff --cc drivers/xen/Makefile
Simple merge

diff --cc kernel/sched/cputime.c
Simple merge