From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Tue, 31 May 2016 14:49:23 +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~149
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=52878831ef157ffacfa51e6aa1b28ab2a2460a75;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
---

52878831ef157ffacfa51e6aa1b28ab2a2460a75