]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:01:04 +0000 (12:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 01:01:04 +0000 (12:01 +1100)
commitb6027c0d3f098cd9c7bbe8ebd9cf6196c4229b55
treee8d161a3fac3dfeba3f49ca97bfef9d3aa2b58a9
parent67f66cc55bbce20bfa8532eb393ea5603dc57c08
parent2fe6b193fd36a939421a7fde29d58031ebc114cd
Merge remote-tracking branch 'sound-asoc/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_i2s.c
sound/soc/tegra/tegra30_i2s.c