From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 11 Sep 2014 21:27:19 +0000 (-0700)
Subject: Merge tag 'ipu-for-staging-3.18' of git://git.pengutronix.de/git/pza/linux into work... 
X-Git-Tag: v3.18-rc1~130^2~591
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4a5c969411ded8f5c5a5c7248855e3c0be565f50;p=users%2Fdwmw2%2Flinux.git

Merge tag 'ipu-for-staging-3.18' of git://git.pengutronix.de/git/pza/linux into work-next

Philipp writes:

IPUv3 CPMEM API change across staging and drm
---

4a5c969411ded8f5c5a5c7248855e3c0be565f50