diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:51:07 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:51:07 -0700 |
commit | f6175f228cc8dab421e762158ad40f5614b18941 (patch) | |
tree | cef7da1df255a45eda06892c6cd8f3fe2ac92543 /arch/m68k/emu | |
parent | 6307e418251240c2d18b3d69b96e50176c51a113 (diff) | |
parent | 7537147710b5a3be5d7ff046d8c3c3f8e5e6a186 (diff) | |
download | op-kernel-dev-f6175f228cc8dab421e762158ad40f5614b18941.zip op-kernel-dev-f6175f228cc8dab421e762158ad40f5614b18941.tar.gz |
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)
Diffstat (limited to 'arch/m68k/emu')
0 files changed, 0 insertions, 0 deletions