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)
commita61bf224d04d7b81b9ba3f907dcd2c2ad7106af4
tree355ef3add2e0c90ac77ea4ab30cb3aa00cb142a8
parent768c1c36c20985b089d98268bd5f6a469bf7f453
parent2c8fa8813fb4067501542671aac4fa5c515bb7b9
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* 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>
arch/arm/boot/dts/dra7-evm.dts