From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sat, 11 Jun 2016 00:35:51 +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~140
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a43e531dbe0a9f156a99e9ff8bdc462757abe79a;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
---

a43e531dbe0a9f156a99e9ff8bdc462757abe79a