From: Olof Johansson <olof@lixom.net>
Date: Tue, 13 Mar 2012 23:51:07 +0000 (-0700)
Subject: Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15253^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f6175f228cc8dab421e762158ad40f5614b18941;p=mirror_ubuntu-artful-kernel.git

Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

* 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
  ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
  (plus two dependent branches from linux-pm)
---

f6175f228cc8dab421e762158ad40f5614b18941