davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
fa2c8f4017
kernel-ark/sound/soc
History
Mark Brown fa2c8f4017 Linux 3.3-rc4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPQDoTAAoJEHm+PkMAQRiGMpYH/ibfyIFBrKMD1v/s9oNvp8rS
 c7J7E7mHZOylCHrpIS3lX3ZbOfOe33Ln0Z59f1/TcV4CMMz0NrKYcTC8erj/H/DA
 8DRYegiczWKqiXRgktwaZXkJcwXYdOOL1WQYxuzzbZcwRrNBY2QpH7Zu8Bj+TPAy
 d4fvJHWdlh4sbWVdQmLRbp04UB9J/Z5/uWmSNvVQjLLdRlD+mEBbt7JjiNY6sUVC
 2sJoAs9F3UlHu7VaN+JIhMOGZ3GqOpHGBxN/aWxJ/7GsXdXuAfCrxoPxaAe4xzOa
 HndN5ZDyg02Vy5uDeUzj+HJPW3M8L4Q0nwxAYb3ZnQ5tbpu1Q2cHfIBealomWCQ=
 =R91X
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c
2012-02-19 18:35:12 -08:00
..
atmel ASoC: Convert afeb9260 to table based DAPM init 2012-02-01 21:52:54 +00:00
au1x Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-01-14 13:05:21 -08:00
blackfin ASoC: blackfin: Use dai_fmt 2012-02-01 18:29:19 +00:00
codecs ASoC: wm8996: Make sure we bounce /RESET to reset 2012-02-17 13:50:51 -08:00
davinci ASoC: replace 0xffffffff with DMA_BIT_MASK macro 2012-01-20 13:58:26 +00:00
ep93xx ep93xx: Don't use system controller defines in audio drivers 2012-01-20 13:58:27 +00:00
fsl ASoC: replace 0xffffffff with DMA_BIT_MASK macro 2012-01-20 13:58:26 +00:00
imx ASoC: Add external amplifier controls for Visstrim_M10. 2012-01-21 21:15:39 +00:00
jz4740 ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card() 2012-01-20 13:58:29 +00: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 ASoC: mxs-saif: use devm_ functions 2012-02-10 20:21:05 +00:00
nuc900 Merge branch 'master' into fixes 2012-01-13 15:00:22 +00:00
omap ASoC: Fix build error in sound/soc/omap/n810.c 2012-02-10 11:38:00 +00:00
pxa ASoC: Add __devinit annotation for pxa2xx_ac97_probe 2012-02-19 18:13:02 -08:00
s6000 ASoC: use proper defines for stream directions in pcm engines 2012-01-20 13:58:25 +00:00
samsung Linux 3.3-rc3 2012-02-09 12:00:22 +00:00
sh Linux 3.3-rc4 2012-02-19 18:35:12 -08:00
tegra ASoC: tegra+alc5632: Added digital microphone DAPM widget. 2012-02-13 11:37:35 -08:00
txx9 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
Kconfig ASoC: Remove LZO cache type 2011-11-10 13:08:09 +00:00
Makefile ASoC: mxs: add asoc configuration files 2011-07-28 11:47:41 +01:00
soc-cache.c ASoC: Remove rbtree register cache 2011-12-13 00:20:28 +08:00
soc-core.c ASoC: soc-core: Show the returned values on error messages 2012-02-17 13:51:01 -08:00
soc-dapm.c ASoC: dapm: Only mark pin widgets as dirty if we actually change state 2012-02-17 08:10:33 -08:00
soc-io.c ASoC: Use regmap update bits operation for drivers using regmap 2012-01-21 21:15:38 +00:00
soc-jack.c ASoC: Remove ifdefs for GPIO_SYSFS 2011-12-21 00:12:28 +00:00
soc-pcm.c ASoC: dapm: Supply the DAI and substream when calling stream events 2012-02-17 08:10:01 -08:00
soc-utils.c ASoC: utils - Add support for a dummy codec driver. 2012-01-20 13:58:27 +00:00