diff options
| author | Mark Brown | 2014-03-06 10:07:39 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-03-06 10:07:39 +0100 |
| commit | 6af5263ceaffc9d4403592dc81cd3b197702dc69 (patch) | |
| tree | 4c144be49e1ade130571d0169e259e9966177962 /arch/arm/mm/proc-v6.S | |
| parent | ASoC: dapm: Break dapm_set_path_status() appart (diff) | |
| parent | ASoC: Move ignore_pmdown_time from CODEC to component (diff) | |
| download | kernel-qcow2-linux-6af5263ceaffc9d4403592dc81cd3b197702dc69.tar.gz kernel-qcow2-linux-6af5263ceaffc9d4403592dc81cd3b197702dc69.tar.xz kernel-qcow2-linux-6af5263ceaffc9d4403592dc81cd3b197702dc69.zip | |
Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum
Conflicts:
include/sound/soc.h
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
0 files changed, 0 insertions, 0 deletions