Mark Brown dc2af52c0d Linux 3.4-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPrxCRAAoJEHm+PkMAQRiGQAgH/icr6rDF/e7Y7LoNErjVag94 +PUhYx851xH3ApPlB1fBaU1ZTvQS2Pb34B8G8WrqWJ+yTs4XfE9sCPj2yb+7ySA8 vb0vPsErVvAcRWv8sP22NF2ERKNFj/PtSNAcAUJHb5djrRmJcZJ3aw03cdY/INAS 2OqJEoMc2IBa5Z+WePQJ8N+J2YgDSDdCnpBKNuSHDGN0rBm4suiWY8PWXgTzMAhG TNgNrKIlN8bnaX4hPJr6ooN+sxInkUl8ZglAPxwwjVtmYvGch4FiowpDC7BQbSGB WFSVsIuv3jMI6VaYDo/NQOFDQqqoK4h7DmBIqbL5eXBRTJg9xW+1A8zloGd4Rks= =IWBQ -----END PGP SIGNATURE----- Merge tag 'v3.4-rc7' into for-3.5 Linux 3.4-rc7 Conflicts): drivers/base/regmap/regmap.c (overlap with bug fixes) sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)		2012-05-13 13:32:54 +01:00
..
dma-sh7760.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
fsi.c	ASoC: fsi: update for dmaengine prep_slave_sg fallout.	2012-04-18 09:16:13 +01:00
hac.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
Kconfig	ASoC: sh: fsi: select simple-card on Kconfig	2012-04-13 11:29:28 +01:00
Makefile	ASoC: sh: fsi: use simple-card instead of fsi-da7210	2012-04-13 11:29:27 +01:00
migor.c	ASoC: sh: fix migor.c compilation	2012-05-09 12:41:05 +01:00
sh7760-ac97.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
siu_dai.c	ASoC: Use core pm_runtime callbacks for siu_dai	2011-12-15 02:26:58 +08:00
siu_pcm.c	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
siu.h	ASoC: Do not include soc-dai.h	2010-11-22 14:04:53 +00:00
ssi.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00