Arnd Bergmann f4e2467bad Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup ... * 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6: ep93xx: Remove unnecessary includes of ep93xx-regs.h ep93xx: Move EP93XX_SYSCON defines to SoC private header ep93xx: Move crunch code to mach-ep93xx directory ep93xx: Make syscon access functions private to SoC ep93xx: Configure GPIO ports in core code ep93xx: Move peripheral defines to local SoC header ep93xx: Convert the watchdog driver into a platform device. ep93xx: Use ioremap for backlight driver ep93xx: Move GPIO defines to gpio-ep93xx.h ep93xx: Don't use system controller defines in audio drivers ep93xx: Move PHYS_BASE defines to local SoC header file (update to v3.3-rc7) Conflicts: arch/arm/mach-s3c2440/common.h		2012-03-15 15:20:07 +00:00
..
atmel	ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC	2012-01-10 14:52:20 -08: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: check for substream not channels_min in pcm engines	2012-01-07 11:18:05 -08:00
codecs	ASoC: ak4642: fixup HeadPhone L/R dapm settings	2012-02-21 10:00:24 +00:00
davinci	ASoC: check for substream not channels_min in pcm engines	2012-01-07 11:18:05 -08:00
ep93xx	ep93xx: Don't use system controller defines in audio drivers	2012-03-14 11:41:08 +11:00
fsl	ASoC: fsl: Add .owner to struct snd_soc_card	2011-12-22 17:34:32 +00:00
imx	ASoC: i.MX SSI: Fix DSP_A format.	2012-02-23 18:58:17 +00:00
jz4740	ASoC: check for substream not channels_min in pcm engines	2012-01-07 11:18:05 -08:00
kirkwood	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
mid-x86	ASoC: check for substream not channels_min in pcm engines	2012-01-07 11:18:05 -08:00
mxs	ASoC: mxs: Fix mxs-saif timeout	2012-01-20 18:38:44 +00:00
nuc900	Merge branch 'master' into fixes	2012-01-13 15:00:22 +00:00
omap	Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc	2012-01-12 09:48:20 +01:00
pxa	ASoC: pxa: Convert corgi to use snd_soc_register_card()	2012-01-02 13:08:40 +00:00
s6000	ASoC: s6000: Add .owner to struct snd_soc_card	2011-12-23 11:32:00 +00:00
samsung	Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup	2012-03-15 15:20:07 +00:00
sh	ASoC: fsi: fixup fsi_pointer() calculation method	2012-02-09 10:50:53 +00:00
tegra	ASoC: check for substream not channels_min in pcm engines	2012-01-07 11:18:05 -08:00
txx9	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-01-17 18:40:24 -08:00
Kconfig	ASoC: Remove LZO cache type	2011-11-10 13:08:09 +00:00
Makefile	ASoC: mxs: add asoc configuration files	2011-07-28 11:47:41 +01:00
soc-cache.c	ASoC: Remove rbtree register cache	2011-12-13 00:20:28 +08:00
soc-core.c	ASoC: core: Better support for idle_bias_off suspend ignores	2012-01-31 19:29:07 +00:00
soc-dapm.c	ASoC: dapm: Check for bias level when powering down	2012-02-23 15:13:02 +00:00
soc-io.c	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
soc-jack.c	ASoC: Remove ifdefs for GPIO_SYSFS	2011-12-21 00:12:28 +00:00
soc-pcm.c	ASoC: soc-pcm: Allocate PCM operations dynamically to support multiple DAIs	2012-01-03 20:28:51 +00:00
soc-utils.c	ASoC: Provide a more complete DMA driver stub	2011-12-06 10:05:07 +00:00