From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 8 May 2015 12:38:55 +0000 (+0200)
Subject: Merge 4.1-rc2 into staging-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~92^2~861
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4da00601edd39184fa187d5fd6dfc36232991cc;p=pandora-kernel.git

Merge 4.1-rc2 into staging-next

We want the fixes in here to make merges and testing easier.

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

b4da00601edd39184fa187d5fd6dfc36232991cc