]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 03:20:09 +0000 (14:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 03:20:09 +0000 (14:20 +1100)
commite017ce8e026df85cc0ad0f3803de894c1a77de2a
tree2c3dafe8d704273152f2716ccb12cb5e75887df3
parent2787f1882ee742e96e68e33fe1888c43f9f7f88b
parentb317b032d2dcb5e518cc9630cc6f1c7c24afedfc
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