| commit | f6175f228cc8dab421e762158ad40f5614b18941 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Mar 13 16:51:07 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Mar 13 16:51:07 2012 -0700 |
| tree | cef7da1df255a45eda06892c6cd8f3fe2ac92543 | |
| parent | 6307e418251240c2d18b3d69b96e50176c51a113 [diff] | |
| parent | 7537147710b5a3be5d7ff046d8c3c3f8e5e6a186 [diff] |
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)