From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 30 Oct 2015 16:24:43 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~247
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1d66705415159dc9b8f799d682cf95320faaf1aa;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

* 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek:
  xen-netfront: update num_queues to real created
  xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
---

1d66705415159dc9b8f799d682cf95320faaf1aa