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)
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>

Trivial merge