Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Mon, 15 Dec 2014 15:21:57 +0000 (09:21 -0600)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Mon, 15 Dec 2014 15:21:57 +0000 (09:21 -0600)
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y

* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  drm/irq: Implement a generic vblank_wait function
  drm/omap: fbdev: add a module option controlling num backbuffers allocated
  OMAPDSS: make dss & dispc runtime PM irq-safe
  PM / Runtime: Better support for nested irq_safe drivers
  ASoC: omap-hdmi-audio: Set SNDRV_PCM_HW_PARAM_BUFFER_BYTES constraint

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>

Trivial merge