Merge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video
authorPraneeth Bajjuri <praneeth@ti.com>
Mon, 15 Jul 2013 06:20:43 +0000 (01:20 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Mon, 15 Jul 2013 06:20:43 +0000 (01:20 -0500)
commit7c744fcb003eb9223cad2296ce7d48b59c2879f1
treea5b88a745f2f410dfa4fac390b79076759106fa0
parent63d5b543195acfbba2286b24c3723c11328d6586
parent852f4296d5b34231e19d89070d25008b8c79a03e
Merge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video

* p-ti-linux-3.8.y-video:
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption
  arm: dra: Add gpu interface clock
  arm: dra7xx: Add gpu hwmod
  arm/dts: dra7: Add gpu supply
  arm: dts: dra7xx: Add gpu data

Conflicts:
arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
arch/arm/boot/dts/dra7-evm.dts