Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux... ti2013.04.00
authorDan Murphy <dmurphy@ti.com>
Thu, 25 Apr 2013 16:34:18 +0000 (11:34 -0500)
committerDan Murphy <dmurphy@ti.com>
Thu, 25 Apr 2013 16:34:18 +0000 (11:34 -0500)
commit23e7f725a6af4ca44660c06bc3569f6ce705d1d0
tree2f9fc9b1c6211607efd3abdb75984cd73d818aaf
parent91e9ffd414cd71be4cbed13ebfd6aab3c6e4dbb7
parent3c79a8595efaf7f38c79eedda1146c9e8821fac0
Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree into ti-linux-3.8.y

TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y

* 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
  omapdss: hdmi: select I2C_ALGOBIT in Kconfig
  OMAPDSS: HDMI: do not set HDMI_TXPHY_POWER_CTRL for OMAP5
  ARM: OMAP: Display: Fix section mismatch
  OMAPDSS: HDMI: Read EDID using I2C bitbanging
  OMAPDSS: HDMI: Enable level shifter for EDID reads
  OMAPDSS: HDMI: Add level shifter control and state
  OMAPDSS: HDMI: Adjust DT gpio parsing
  arm: dts: omap5-uevm: Define HDMI I2C GPIOS
  drm/omap: Enable DT support for DMM
  ARM: OMAP: Display: Use DMM DT bindings if present
  ARM: dts: OMAP4+: Add DMM bindings
  TI-Integration: ARM:dts:omap4-panda-common: Add back A/V content

Conflicts:
arch/arm/boot/dts/omap4-panda.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi