Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:51:07 +0000 (16:51 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:51:07 +0000 (16:51 -0700)
commitf6175f228cc8dab421e762158ad40f5614b18941
treecef7da1df255a45eda06892c6cd8f3fe2ac92543
parent6307e418251240c2d18b3d69b96e50176c51a113
parent7537147710b5a3be5d7ff046d8c3c3f8e5e6a186
Merge branch 'next/devel-samsung-pd' of git://git./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)
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-universal_c210.c