Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorVishal Mahaveer <vishalm@ti.com>
Wed, 27 May 2015 13:16:46 +0000 (08:16 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Wed, 27 May 2015 13:16:46 +0000 (08:16 -0500)
* p-ti-linux-3.14.y-common:
  OMAPDSS: Reorder the Makefile so that LCD is loaded before HDMI
  Revert "TEMP: ARM: dts: dra7-evm: add i2c2 pinmux back in kernel"
  i2c: tvp5158: Enabling the enum_framesizes subdev op
  ARM: dts: dra7-evm: Add TVP5158 node
  ti_fragments: audio_display: Make VIP/VPE/TVP5158 a built-in
  i2c: tvp5158: Analog camera decoder driver

Change-Id: I14ac5fd2badd21d77a559e9ea76cba2a3a78190e
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
1  2 
arch/arm/boot/dts/dra7-evm.dts

Simple merge