From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 3 Dec 2014 00:20:59 +0000 (-0800)
Subject: Merge 3.18-rc7 into staging-work.
X-Git-Tag: omap-for-v3.19/fixes-rc1~73^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deef2a118aed02aa9421e399056c82045e728282;p=pandora-kernel.git

Merge 3.18-rc7 into staging-work.

We want those staging fixes in here as well.

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

deef2a118aed02aa9421e399056c82045e728282
Reading git-diff-tree failed