Olof Johansson 0f9cb211ba Linux 3.7-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+ 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4= =CPoy -----END PGP SIGNATURE----- Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-25 21:34:34 -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	Merge branch 'asoc-omap' into for-3.7	2012-09-05 20:05:11 +08:00
cirrus	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
codecs	Merge branches 'fix/arizona', 'fix/cs4271', 'fix/kirkwood' and 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into tmp	2012-11-21 11:41:15 +09:00
davinci	ASoC: Davinci: McASP: add support new McASP IP Variant	2012-09-06 08:20:33 +08:00
dwc	ASoC: dwc: Staticise non-exported i2s_start()	2012-07-04 19:15:43 +01:00
fsl	ARM: imx: remove header file mach/irqs.h	2012-10-15 10:05:43 +08:00
generic	ASoC: add generic simple-card support	2012-04-13 11:29:25 +01:00
jz4740	ASoC: JZ4740: Replaced comma operators with semicolons.	2012-04-06 18:22:05 +01:00
kirkwood	ASoC: kirkwood-i2s: more pause-mode fixes	2012-11-21 10:38:39 +09:00
mid-x86	ASoC: mid-x86 - add support for compressed streams	2012-08-20 20:50:39 +01:00
mxs	ASoC: mxs-saif: Fix channel swap for 24-bit format	2012-11-02 15:03:06 +00:00
nuc900	Merge branch 'master' into fixes	2012-01-13 15:00:22 +00:00
omap	Merge branch 'omap/headers4' into next/cleanup	2012-11-15 17:06:24 +01:00
pxa	ASoC: Fixes for v3.7	2012-10-17 14:09:15 +02:00
s6000	ASoC: use proper defines for stream directions in pcm engines	2012-01-20 13:58:25 +00:00
samsung	ASoC: bells: Fix up git patch application failure	2012-11-16 09:30:56 +09:00
sh	ASoC: fsi: don't reschedule DMA from an atomic context	2012-10-09 15:47:33 +09:00
spear	ASoC: spear: correct the check for NULL dma_buffer pointer	2012-08-31 14:24:52 -07:00
tegra	ARM: tegra: remove <mach/dma.h>	2012-11-05 11:36:06 -07:00
txx9	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
ux500	ASoC: ux500_msp_i2s: Fix devm_* and return code merge error	2012-10-16 14:14:31 +09:00
Kconfig	ASoC: Rename ep93xx soc directory to cirrus	2012-08-28 10:24:21 -07:00
Makefile	ASoC: dmaengine: Correct Makefile when sound is built as module	2012-10-09 15:57:33 +09:00
soc-cache.c	ASoC: Remove rbtree register cache	2011-12-13 00:20:28 +08:00
soc-compress.c	ASoC: soc-compress: Remove unused variable	2012-08-21 15:09:44 +01:00
soc-core.c	ASoC: core: Double control update err for snd_soc_put_volsw_sx	2012-11-09 16:32:05 +00:00
soc-dapm.c	ASoC: dapm: Use card_list during DAPM shutdown	2012-11-09 16:31:59 +00:00
soc-dmaengine-pcm.c	dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic()	2012-09-24 18:35:29 +02:00
soc-io.c	ASoC: io: Don't dereference regmap if we failed to get one	2012-06-23 12:11:32 +01:00
soc-jack.c	ASoC: fix documentation in soc-jack	2012-10-09 15:38:23 +09:00
soc-pcm.c	ASoC: dpcm: Allow FE to be opened without valid BE routes.	2012-07-06 19:06:58 +01:00
soc-utils.c	ASoC: utils - Add support for a dummy codec driver.	2012-01-20 13:58:27 +00:00