]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:13:52 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:13:52 +0000 (13:13 +1100)
commitadcd78b5bab2d47064439861cbd34ad32ac5ace8
treee01b745705bca36e3e74b32434cf08823c72c506
parent590c2e09011f1457a8a0b7fc64e51a8ecfbda92f
parentcdef2e5f358db5fd27eec4c72eb295c232287813
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