From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 27 Oct 2016 17:53:17 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
X-Git-Tag: v4.1.12-92~55
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=14e4da7493faab8e3b9c7b35e773e0e456035aaf;p=users%2Fjedix%2Flinux-maple.git

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
---

14e4da7493faab8e3b9c7b35e773e0e456035aaf