Mark Brown d5efccd5b6 Linux 3.4-rc3 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEbBAABAgAGBQJPi3XOAAoJEHm+PkMAQRiGnsUH9RjHwH4YFVyuP/DKtKa6zs74 wqkpT15yITQ5WWMog4JaJFFg5rJCUd8QZr7AS/HSn0ijDyZX5VU7Rcs9cMudDzNR H/5K/AscS4fjb0HwWVqoltTWHRb9QGSwVN3+E3VCDLt9P89YJ0o3QztkkuEX5dkZ jc7reVXTfRnCcILEa9jleOzrn+OLM3j/jAjQ2hGunl8EDLzD4b17HHPoli4jEZ/5 5ibpSVsPD+AqzN+glbXvYjVItl12D0IQos/JdOwfuZriCVWLxysSSwHZTbPCyvBZ LHH4HR5T+XLSXbjJeNkUFHLzqU+d5gVRadIoWtJCxqxFjKbOs2YtzJ5Ai0nDiw== =kTkC -----END PGP SIGNATURE----- ASoC: Merge tag 'v3.4-rc3' into for-3.5 Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting annoyingly with the new development that's going on for Tegra so merge it up to resolve those conflicts. Conflicts: sound/soc/soc-core.c sound/soc/tegra/tegra_i2s.c sound/soc/tegra/tegra_spdif.c		2012-04-16 19:40:27 +01:00
..
atmel	ASoC: Convert afeb9260 to table based DAPM init	2012-02-01 21:52:54 +00:00
au1x
blackfin	ASoC: blackfin: Use dai_fmt	2012-02-01 18:29:19 +00:00
codecs	Linux 3.4-rc3	2012-04-16 19:40:27 +01:00
davinci
ep93xx	ASoC: ep93xx-i2s: use devm_* helpers to cleanup probe	2012-04-01 11:28:29 +01:00
fsl	Linux 3.4-rc3	2012-04-16 19:40:27 +01:00
generic	ASoC: add generic simple-card support	2012-04-13 11:29:25 +01:00
jz4740	ASoC: JZ4740: Replaced comma operators with semicolons.	2012-04-06 18:22:05 +01:00
kirkwood	ASoC: Convert kirkwood-openrd to use snd_soc_register_card()	2012-02-07 19:40:53 +00:00
mid-x86	ASoC: core: Add support for DAI and machine kcontrols.	2012-02-04 12:40:11 +00:00
mxs	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
nuc900
omap	ARM: board specific updates	2012-03-27 16:27:28 -07:00
pxa	Linux 3.4-rc3	2012-04-16 19:40:27 +01:00
s6000
samsung	ARM: global cleanups	2012-03-27 16:03:32 -07:00
sh	ASoC: sh: fsi: select simple-card on Kconfig	2012-04-13 11:29:28 +01:00
tegra	ASoC: convert Tegra20 DAS driver to regmap	2012-04-13 19:16:53 +01:00
txx9	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
Kconfig	ASoC: add generic simple-card support	2012-04-13 11:29:25 +01:00
Makefile	ASoC: add generic simple-card support	2012-04-13 11:29:25 +01:00
soc-cache.c
soc-core.c	Linux 3.4-rc3	2012-04-16 19:40:27 +01:00
soc-dapm.c	ASoC: soc-dapm: Use '%llx' with 'u64' type.	2012-04-16 19:36:46 +01:00
soc-dmaengine-pcm.c	ASoC: dmaengine_pcm: use dmaengine cyclic wrapper	2012-03-26 18:28:11 +01:00
soc-io.c	ASoC: io: Retrieve val_bytes from the regmap API	2012-02-21 19:34:47 +00:00
soc-jack.c	ASoC: jack: Push locking for jacks down to the jack	2012-04-01 11:28:23 +01:00
soc-pcm.c	ASoC: dapm: Add platform stream event support	2012-04-01 11:28:22 +01:00
soc-utils.c	ASoC: utils - Add support for a dummy codec driver.	2012-01-20 13:58:27 +00:00