| author | Dan Murphy <dmurphy@ti.com> | |
| Tue, 16 Apr 2013 15:23:18 +0000 (10:23 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Tue, 16 Apr 2013 15:23:18 +0000 (10:23 -0500) | ||
| commit | 9667351047b9fe5d83cedda82024ece1fe65ea67 | |
| tree | 617f305cdd64bf456beb00458e16969779251c8c | tree | snapshot (tar.xz tar.gz zip) |
| parent | 47077082cf139da7b6b338bfcfdaffb084bc57c4 | commit | diff |
| parent | b09f88c2d2c6aa6847e5c9d6efe0a700a08f9f85 | commit | diff |
Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree into ti-linux-3.8.y
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' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
Signed-off-by: Dan Murphy <dmurphy@ti.com>
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' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| arch/arm/configs/omap2plus_defconfig | diff1 | | diff2 | | blob | history |