linux-sg2042/sound/soc/imx
Linus Torvalds dd58ecba48 Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
  ARM: msm: platsmp: determine number of CPU cores at boot time
  ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
  ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
  ARM: orion5x: fixup 5181 MPP mask check
  ARM: mxs-dma: include <linux/dmaengine.h>
  ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
  ARM: i.MX53: UARTn_CTS pin should not change RTS input select
  ARM: i.MX53: UARTn_TXD pin should not change RXD input select
  ARM: mx25: Fix typo on CAN1_RX pad setting
  iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
  ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: i.MX53: Fix IOMUX type o's
  ARM i.MX dma: Fix burstsize settings
  mach-mx5: fix the I2C clock parents
  ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
  ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
  ARM: mx53: Fix some interrupts marked as reserved.
  MXC: iomux-v3: correct NO_PAD_CTRL definition
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
2011-07-25 11:53:35 -07:00
..
Kconfig ASoC: imx: Remove unused Kconfig SND_MXC_SOC_SSI entry 2011-06-23 20:08:30 +01:00
Makefile ASoC: Add machine driver for Visstrim_M10 board. 2011-03-07 11:48:18 +00:00
eukrea-tlv320.c Merge branch 'for-2.6.38' into for-2.6.39 2011-02-26 09:50:01 +00:00
imx-pcm-dma-mx2.c Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/fixes 2011-07-15 21:56:37 +02:00
imx-pcm-fiq.c ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
imx-ssi.c Merge branch 'for-3.0' into for-3.1 2011-06-23 20:10:28 +01:00
imx-ssi.h ASoC: core - Optimise and refactor pcm_new() to pass only rtd 2011-06-07 18:38:27 +01:00
mx27vis-aic32x4.c ASoC: Add machine driver for Visstrim_M10 board. 2011-03-07 11:48:18 +00:00
phycore-ac97.c Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
wm1133-ev1.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00