| author | Dan Murphy <DMurphy@ti.com> | |
| Fri, 19 Dec 2014 20:13:23 +0000 (14:13 -0600) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Fri, 19 Dec 2014 20:13:23 +0000 (14:13 -0600) | ||
| commit | 9487ff673d3cf100391aaeea7d56ef2daac2a36b | |
| tree | 9d519dea21ef631615228978b2b08c422dfa77aa | tree | snapshot (tar.xz tar.gz zip) |
| parent | 14ed5c86d20d0e7660b3ee6c575513128aebda8a | commit | diff |
| parent | cf74278c71596ac93f84ab9e5c3fe0216ab5e02f | commit | diff |
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-3.14.y
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:
ASoC: tlv320aic31xx: Do not ignore errors in aic31xx_device_init()
video/logo: prevent use of logos after they have been freed
drm/omap: fix race conditon in DMM
drm/omap: fix race condition with dev->obj_list
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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:
ASoC: tlv320aic31xx: Do not ignore errors in aic31xx_device_init()
video/logo: prevent use of logos after they have been freed
drm/omap: fix race conditon in DMM
drm/omap: fix race condition with dev->obj_list
Signed-off-by: Dan Murphy <DMurphy@ti.com>