Mark Brown ddfb43f388 Linux 3.6-rc6 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQVkutAAoJEHm+PkMAQRiGW8sH/36FVQ3zI75QH16AmR++2nMZ
 BRJGoxcRFMssrXTYVdkMyzygf8b7MZbNEn1qt2g63MNzGaJucPlw5NVL4GLzR+zr
 x/EglLrTEPCD5el9wJ3ls9iC1soudKQTvC2BjcdUjpoSwHrDM/7GKfbOacE54Wqc
 C1VHCcg5DWOD7F0RnYT2SQEVCeDODNmcyFdk7Oi4cUicTPJoYWJ9O9MGfBDBok0N
 M+dXxa9nvsl7EeEKpBKH9vo4TfXn3Gsj6LCRdedvI15ilZjfo8jdHYbSn7KBfQuZ
 JIKRnqkaQ1JfMFt+M/JJZ1b/+Wrd4HLMmmn5oUmrGGIvhpi32nJfi/97+nSy8iU=
 =c5gW
 -----END PGP SIGNATURE-----

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c

2012-09-22 11:26:27 -04:00

..

ac97.c

ASoC: Samsung: Update email id of the author

2012-02-29 23:37:57 +00:00

bells.c

ASoC: bells: Add machine driver for Wolfson Bells boards

2012-08-09 19:34:30 +01:00

dma.c

ASoC: samsung dma - Don't indicate support for pause/resume.

2012-09-06 18:55:59 +08: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: Samsung: Added to support mono recording

2012-03-16 18:50:41 +00:00

i2s.h

ASoC: Samsung: Update email id of the author

2012-02-29 23:37:57 +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: SAMSUNG: Change Kconfig to support all SAMSUNG ASoC

2012-08-28 10:17:40 -07:00

littlemill.c

ASoC: littlemill: Add userspace control of the WM1250 I/O

2012-07-18 22:09:23 +01:00

ln2440sbc_alc650.c

ASoC: samsung: Add .owner to struct snd_soc_card

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

lowland.c

ASoC: lowland: Support digital link for WM9081

2012-05-08 12:29:17 +01:00

Makefile

ASoC: bells: Add machine driver for Wolfson Bells boards

2012-08-09 19:34:30 +01:00

neo1973_wm8753.c

Merge branch 'topic/asoc' into for-linus

2012-03-18 18:22:37 +01:00

pcm.c

ASoC: Samsung: Fix build error

2012-08-10 18:07:20 +01: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 S3C24XX I2S driver to gpiolib API

2012-07-15 22:21:42 +01:00

s3c24xx-i2s.h

ASoC: Samsung: Rename from s3c24xx to samsung

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

s3c2412-i2s.c

ASoC: Convert S3C2412 I2S driver to gpiolib API

2012-07-15 22:21:42 +01: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: Update email id of the author

2012-02-29 23:37:57 +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: smdk_wm8994: Convert to use snd_soc_register_card()

2012-07-03 19:48:29 +01: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: Update email id of the author

2012-02-29 23:37:57 +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 hookup of WM0010 on Speyside

2012-08-25 13:53:15 +01:00

tobermory.c

ASoC: samsung: Add .owner to struct snd_soc_card

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