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
..
Kconfig	ASoC: Ux500: Add machine-driver	2012-06-17 20:46:12 +01:00
Makefile	ASoC: Ux500: Add machine-driver	2012-06-17 20:46:12 +01:00
mop500_ab8500.c	ASoC: Ux500: Add machine-driver	2012-06-17 20:46:12 +01:00
mop500_ab8500.h	ASoC: Ux500: Add machine-driver	2012-06-17 20:46:12 +01:00
mop500.c	ASoC: Ux500: Add machine-driver	2012-06-17 20:46:12 +01:00
ux500_msp_dai.c	ASoC: ux500: Strengthen error checking after memory allocation	2012-08-03 23:03:55 +01:00
ux500_msp_dai.h	ASoC: Ux500: Add MSP I2S-driver	2012-05-09 12:52:59 +01:00
ux500_msp_i2s.c	Linux 3.6-rc6	2012-09-22 11:26:27 -04:00
ux500_msp_i2s.h	ASoC: ux500: Include the correct header files	2012-07-26 12:58:34 +01:00
ux500_pcm.c	ASoC: dmaengine-pcm: Rename and deprecate snd_dmaengine_pcm_pointer	2012-06-20 15:38:32 +01:00
ux500_pcm.h	ASoC: Ux500: Add platform-driver	2012-06-03 13:06:38 +01:00