Mark Brown a08a499aa3 Linux 3.3-rc3 ...

.. the number of the half-beast?
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPMzv8AAoJEHm+PkMAQRiGgeYIAJxxGCxSMLRIiPaGRmQbWifs
 eE3z6AUWitGfYvhmYdWVz+C/aa4pPCVWr3bAFxUQhu+ESmiFIiqiefvlTRf5f84e
 pcoJFobkFfhtK4gLvUr75WxXDFq/1HhKqW1OLzIW4gQsnhMdjGJ3lLK6ZoRYH8h4
 cGoN3DRII9mVLFcB2sgbeRvbQBA/O4n0aOQ2ryZkCcPQQMIKhR/rUEEV2pe/ovHE
 rumQgI3PVey816P4e5YnOvrEAllFZlaZ/F0ClJgNdfeQCVTZx9KNRbiNxHi6fcC5
 6Zgg7e5EvQTAy7QqQZ0hmS4k4CFmnswX3Nm+ZabRNqBdLSjPEDD9hk1o1dodYCg=
 =BBLC
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.

Linux 3.3-rc3

.. the number of the half-beast?

Conflicts:
	sound/soc/codecs/wm5100.c
	sound/soc/codecs/wm8994.c

2012-02-09 12:00:22 +00:00

..

ac97.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

dma.c

ASoC: replace 0xffffffff with DMA_BIT_MASK macro

2012-01-20 13:58:26 +00:00

dma.h

ASoC: Samsung: Update DMA interface

2011-09-14 11:10:04 +05:30

goni_wm8994.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

h1940_uda1380.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

i2s-regs.h

ASoC: SAMSUNG: Add idma related register definition

2011-06-26 12:05:23 +01:00

i2s.c

ASoC: Add trivial pm_runtime usage to Samsung DAI drivers

2011-12-23 12:08:32 +00:00

i2s.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

idma.c

ASoC: Fix idma build after update for channel count check

2012-01-08 23:04:28 -08:00

idma.h

ASoC: Fix __iomem annotation for IDMA registers

2011-11-29 17:28:16 +00:00

jive_wm8750.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

Kconfig

ASoC: Make SND_SOC_LITTLEMILL select MFD_WM8994

2011-12-04 01:17:05 +00:00

littlemill.c

ASoC: samsung: Enable accessory detect for WM8994 on Littlemill

2012-02-06 14:04:51 +00:00

ln2440sbc_alc650.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

lowland.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

Makefile

ASoC: Rename Speyside WM8962 to Tobermory

2011-11-30 20:49:05 +00:00

neo1973_wm8753.c

Linux 3.3-rc3

2012-02-09 12:00:22 +00:00

pcm.c

ASoC: Add trivial pm_runtime usage to Samsung DAI drivers

2011-12-23 12:08:32 +00:00

pcm.h

ASoC: SAMSUNG: Move PCM specific definitions into pcm.c

2011-01-10 11:38:22 +00:00

regs-i2s-v2.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

rx1950_uda1380.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec_hermes.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec_tlv320aic23.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec.c

ASoC: core: Add support for DAI and machine kcontrols.

2012-02-04 12:40:11 +00:00

s3c24xx_simtec.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

s3c24xx_uda134x.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx-i2s.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

s3c24xx-i2s.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

s3c2412-i2s.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

s3c2412-i2s.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

s3c-i2s-v2.c

ASoC: samsung: s3c-i2s-v2.c needs module.h

2011-10-03 21:34:12 +01:00

s3c-i2s-v2.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

smartq_wm8987.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk2443_wm9710.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_spdif.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8580.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8580pcm.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8994.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8994pcm.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm9713.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

spdif.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

spdif.h

ASoC: Samsung: Rename from s3c24xx to samsung

2010-11-23 14:13:04 +00:00

speyside.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

tobermory.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00