aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-28 12:25:12 +0100
committerMark Brown <broonie@kernel.org>2014-09-28 12:25:12 +0100
commit82b925c405444b760e743b55a9ad498cb3551afe (patch)
treece482a3894e3403b316881edefbe007d852642c5 /sound
parentdfae90ed7fb5f928a219049829a00356632da19b (diff)
parent2e4ec1c0b8791f3556576a19cf56941c3d2a90fc (diff)
parent6596aa047b624aeec2ea321962cfdecf9953a383 (diff)
parent85151461f114f2fca386bb8ae6de185461d35d87 (diff)
parent66d627d554a4284dad00b2039efd18e1c129cc2f (diff)
downloadlinux-82b925c405444b760e743b55a9ad498cb3551afe.tar.gz
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/fsl-ssi' and 'asoc/fix/rt286' into asoc-linus