]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:55:18 +0000 (12:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:55:18 +0000 (12:55 +1100)
commit4a206227af07fccdbe87663c45132f87ae15fca0
tree1a54bd6e1280a7c11e3eba64d78eb7011976a0a0
parentae598919ce583d057a3df13a3d86d3a59a55d5b0
parent929559be6d2c494e25bb58b730da4a78c1459e7b
Merge remote-tracking branch 'sound/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c
include/sound/rcar_snd.h
sound/soc/fsl/fsl_ssi.c
sound/soc/tegra/Kconfig
sound/soc/tegra/tegra20_ac97.c
sound/soc/tegra/tegra_pcm.c