From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Mon, 17 Aug 2015 18:48:24 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~302
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72865ca11d65ca8a70c81d461d9d51774088093e;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  OVMAPI: port ovmapi.ko to UEK4 from UEK3
---

72865ca11d65ca8a70c81d461d9d51774088093e