Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

author Chuck Anderson <chuck.anderson@oracle.com>

Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)

committer Chuck Anderson <chuck.anderson@oracle.com>

Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)
author Chuck Anderson <chuck.anderson@oracle.com>
Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)
committer Chuck Anderson <chuck.anderson@oracle.com>
Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)
diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc drivers/net/xen-netback/xenbus.c
Simple merge
diff --cc drivers/xen/Makefile
Simple merge
author	Chuck Anderson <chuck.anderson@oracle.com>
	Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)
committer	Chuck Anderson <chuck.anderson@oracle.com>
	Sun, 22 May 2016 23:16:52 +0000 (16:16 -0700)
		1	2
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/xenbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/xen/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history