linux/sound/soc
Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
2009-12-08 08:15:29 -08:00
..
atmel ASoC: at91sam9g20ek_2mmc board uses same audio connexion as at91sam9g20ek 2009-10-09 12:41:55 +01:00
au1x ASoC: au1x: dbdma2: plug memleak in pcm device creation error path 2009-12-03 10:49:55 +00:00
blackfin Merge branch 'for-2.6.32' into for-2.6.33 2009-10-01 11:35:11 +01:00
codecs Merge branch 'topic/asoc' into for-linus 2009-12-04 16:22:41 +01:00
davinci ASoC: DaVinci: use edma_pause, edma_resume 2009-11-19 10:48:27 +00:00
fsl ASoC: mpc5200: remove duplicate identical IRQ handler 2009-11-10 13:02:01 +00:00
imx Merge branch 'for-2.6.32' into for-2.6.33 2009-10-08 10:45:09 +01:00
omap Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2009-12-08 08:15:29 -08:00
pxa ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API 2009-11-30 13:27:29 +00:00
s3c24xx ASoC: Added the CPU driver for PCM controllers 2009-11-18 13:35:05 +00:00
s6000 ASoC: Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK 2009-11-17 09:04:06 +01:00
sh ASoC: sh: fsi: Add runtime PM support 2009-11-30 12:56:44 +00:00
txx9 ASoC: txx9aclc: dynamically allocate dmaengine devname 2009-06-25 21:06:30 +01:00
Kconfig ASoC: Hook i.MX into build 2009-08-15 11:37:30 +01:00
Makefile ASoC: Add bit clock rate calculator utility functions 2009-11-12 16:45:48 +00:00
soc-cache.c ASoC: Convert soc-cache to use C99 style initialisers for the table 2009-09-21 04:21:47 -07:00
soc-core.c ASoC: move setting ac97 platformdata earlier than ac97 read/write 2009-11-12 16:45:52 +00:00
soc-dapm.c Merge branch 'for-2.6.32' into for-2.6.33 2009-11-23 13:37:04 +00:00
soc-jack.c ASoC: Add jack_status_check callback function for GPIO jacks 2009-11-12 16:45:53 +00:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00