Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform ... * multiplatform/platform-data: ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions Conflicts due to removed files: arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to code removal: arch/arm/mach-tegra/board-paz00.c Context conflicts in: drivers/mmc/host/sdhci-tegra.c drivers/net/irda/pxaficp_ir.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-09-22 01:07:21 -07: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: bfin: fix memory leak in sport3 controller driver	2012-08-09 14:08:59 +01:00
codecs	ASoC: Updates for 3.6	2012-09-15 08:24:42 +02:00
davinci	ASoC: Davinci: McASP: Flush the FIFO before enabling	2012-08-09 14:05:47 +01:00
dwc	ASoC: dwc: Staticise non-exported i2s_start()	2012-07-04 19:15:43 +01:00
ep93xx	ARM: ep93xx: move platform_data definitions	2012-09-14 11:16:55 +02:00
fsl	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07: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	ARM: orion: move platform_data definitions	2012-09-19 17:42:17 +02:00
mid-x86	ASoC: core: Add support for DAI and machine kcontrols.	2012-02-04 12:40:11 +00:00
mxs	ASoC: mxs: Fix the name of the SoC family	2012-08-08 12:15:10 +01:00
nuc900	Merge branch 'master' into fixes	2012-01-13 15:00:22 +00:00
omap	This branch contains mostly scripted changes to make omap	2012-09-20 20:27:06 -07:00
pxa	ARM: pxa: move platform_data definitions	2012-09-14 11:18:10 +02:00
s6000	ASoC: use proper defines for stream directions in pcm engines	2012-01-20 13:58:25 +00:00
samsung	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
sh	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
spear	ASoC: spear: correct the check for NULL dma_buffer pointer	2012-08-31 14:24:52 -07:00
tegra	ASoC: tegra: remove support of legacy DMA driver based access	2012-09-17 09:34:44 -06:00
txx9	dmaengine/dma_slave: introduce inline wrappers	2012-03-21 19:20:22 +05:30
ux500	ASoC: ux500_msp_i2s: better use devm functions and fix error return code	2012-08-20 20:44:28 +01:00
Kconfig	ASoC: Add support for synopsys i2s controller as per ASoC framework.	2012-06-22 10:25:45 +01:00
Makefile	ASoC: Add support for synopsys i2s controller as per ASoC framework.	2012-06-22 10:25:45 +01:00
soc-cache.c	ASoC: Remove rbtree register cache	2011-12-13 00:20:28 +08:00
soc-core.c	ASoC: core: Upgrade the severity of probe deferral errors to dev_err()	2012-08-09 19:34:04 +01:00
soc-dapm.c	ASoC: dapm: Don't force card bias level to be updated	2012-08-25 13:51:09 +01:00
soc-dmaengine-pcm.c	ASoC: dmaengine_pcm: fix typo in comment	2012-06-25 09:52:44 +01: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: jack: Always notify full jack status	2012-08-13 20:47:58 +01: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