Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
authorPraneeth Bajjuri <praneeth@ti.com>
Mon, 15 Jul 2013 06:22:02 +0000 (01:22 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Mon, 15 Jul 2013 06:22:02 +0000 (01:22 -0500)
* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  OMAP5: android: defconfig: Enable display and video features
  ARM: GPIO: android: defconfig: Enable GPIO Switch Class support
  ARM: OMAP: android: defconfig: Enable Kernel Preemption

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

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

Trivial merge