Merge branch 'omap5_audio_video-3.8.y' into ti-linux-3.8.y
authorDan Murphy <dmurphy@ti.com>
Thu, 14 Mar 2013 13:37:44 +0000 (08:37 -0500)
committerDan Murphy <dmurphy@ti.com>
Thu, 14 Mar 2013 13:37:44 +0000 (08:37 -0500)
commit16a9f7d71878c27594192992aa1b36666ceb292c
tree5cccd046adad7d084d106616b3ea93fcc7b5e7a0
parentefcffb29163dae44f6da9118eb48f9cc01a0fed7
parent04c34f3eef2ef86956a14d8699f0dee68e98f83c
Merge branch 'omap5_audio_video-3.8.y' 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:
  ARM: omap2: include linux/errno.h in hwmod_reset
  Revert "ASoC: abe fw: Include ABE FW in kernel firmware directory."

Signed-off-by: Dan Murphy <dmurphy@ti.com>