| author | Dan Murphy <DMurphy@ti.com> | |
| Tue, 26 May 2015 12:47:57 +0000 (07:47 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Tue, 26 May 2015 12:47:57 +0000 (07:47 -0500) | ||
| commit | 2338bebf9cf2825b6fecd6bc12385fabfba12281 | |
| tree | 15407294794f82ef8b8e4a87d0d81a2df1437063 | tree | snapshot (tar.xz tar.gz zip) |
| parent | c46632d93c5e1d56bb79748e9bcf6f949c851d9f | commit | diff |
| parent | 6fd58b80179b1e778e0d58c45079ab440308a80f | 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:
media: ti-vpe: vpe: Fix kernel warning on close
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:
media: ti-vpe: vpe: Fix kernel warning on close
Signed-off-by: Dan Murphy <DMurphy@ti.com>