author | Dan Murphy <DMurphy@ti.com> | |
Wed, 12 Nov 2014 10:33:21 +0000 (04:33 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Wed, 12 Nov 2014 10:33:21 +0000 (04:33 -0600) | ||
commit | e630db67cb3b09dab94d2bf8637853dc3c1188b1 | |
tree | b8431d884af466ad97d47210b9a5e3f9c0c4ef91 | tree | snapshot (tar.xz tar.gz zip) |
parent | 0e6c1bfe08220ae64ce12a858d8ab4f208c684be | commit | diff |
parent | 49267297ffe3d52890ee7f58001510b865f9329d | 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:
ARM: DRA7: hwmod: Fix CAL hwmod flag to allow sw supervised standby
media: ti-vpe: vip: Fix format enumeration to match sensor capabilities
media: ti-vpe: vip: Fix enuminput error
media: ti-vpe: vip: Fix priority parameter checking
media: ti-vpe: vip: Fix frame format and intervals enumerations
media: ti-vpe: vip: Fix multiple device open
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:
ARM: DRA7: hwmod: Fix CAL hwmod flag to allow sw supervised standby
media: ti-vpe: vip: Fix format enumeration to match sensor capabilities
media: ti-vpe: vip: Fix enuminput error
media: ti-vpe: vip: Fix priority parameter checking
media: ti-vpe: vip: Fix frame format and intervals enumerations
media: ti-vpe: vip: Fix multiple device open
Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | diff1 | | diff2 | | blob | history |