]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:16:20 +0000 (16:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:16:20 +0000 (16:16 +1100)
commitefdf7d8a8e964145d324be04dadac89f24455a58
treef124d43f42bcfc444519040785662e6a9e5d1d79
parentdf063310297f7e6812413431c08e14e0d1f5f22c
parentb8bab04829ab190f71921d4180bda438ba6124ae
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