Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux...
authorDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 17:44:16 +0000 (12:44 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 17:44:16 +0000 (12:44 -0500)
commit47077082cf139da7b6b338bfcfdaffb084bc57c4
tree520e2cf6c1281bf1642b6dac18afa40d2044fc1d
parente09afb78fb68118473dc9fed05e707170ec3bd4a
parentbd3a383a84a66dc722a2a9f1075b35c176f433ae
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:
  ARM: OMAP: Display: Fix compile issues
  ASoC: omap-abe-core: Call driver_deffered_probe_trigger only if built in
  ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module

Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/configs/omap2plus_defconfig