Merge branch 'topic-0620b/samsung-3d-3.4' into chromeos-exynos-3.4
authorOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:39:10 +0000 (11:39 -0700)
committerOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:39:10 +0000 (11:39 -0700)
commit7880b0c2d1a1fe08613b0ce91d2986dfab947b7d
tree0920db055ce8adeb046a468fbe6cd271dbb501ca
parent5f745e38960a90494a4accfed57257afaaafdf9b
parent230413657f742f57876e57f8bee494bc93213d01
Merge branch 'topic-0620b/samsung-3d-3.4' into chromeos-exynos-3.4

* topic-0620b/samsung-3d-3.4:
  drm: vithar: don't default to enabled
  arm: exynos5: Add G3D physical address on Exynos5
  arm: exynos5: Add irq definitions for GPU
  gpu: vithar: Add DVFS in Kconfig and fix compilation issues
  gpu: vithar: Fix for deadlock in mali kbase.
  gpu: vithar: Removal of UMP dependent code from Vithar
  EXYNOS5: GPU: Makefile hack for vithar
  gpu: vithar: Add vithar code base to kernel