From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 May 2015 20:52:44 +0000 (-0700)
Subject: Merge 4.1-rc4 into staging-next
X-Git-Tag: v4.2-rc1~88^2~629
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=936a0cd52aa5d024c583e36e2f21bf6ec2e527e4;p=linux.git

Merge 4.1-rc4 into staging-next

We want the fixes in here for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

936a0cd52aa5d024c583e36e2f21bf6ec2e527e4