From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Wed, 10 Aug 2016 21:32:10 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-92~93
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce8f90d8fe45a43c9263cef10022083fef5f2212;p=users%2Fjedix%2Flinux-maple.git

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

ce8f90d8fe45a43c9263cef10022083fef5f2212