1
0
Fork 0
alistair23-linux/sound/soc
Linus Torvalds 66dc918d42 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...
2011-01-13 10:32:54 -08:00
..
atmel Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
au1x ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
blackfin ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
codecs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2011-01-13 10:32:54 -08:00
davinci ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers 2011-01-05 11:28:50 +00:00
ep93xx ASoC: EP93xx: sampling rate range extended 2010-12-09 11:10:17 +00:00
fsl ASoC: Add missing dev_set_drvdata in p1022_ds_probe 2010-11-29 18:28:53 +00:00
imx Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 11:17:24 +00:00
jz4740 ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
kirkwood ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
nuc900 Merge branch 'for-2.6.37' into for-2.6.38 2010-11-30 11:35:43 +00:00
omap Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc 2011-01-12 07:20:30 +01:00
pxa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2011-01-13 10:32:54 -08:00
s6000 ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers 2011-01-05 11:28:50 +00:00
samsung Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2011-01-13 10:32:54 -08:00
sh ASoC: fix migor audio build 2011-01-11 11:00:55 +00:00
txx9 ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
Kconfig ASoC: Make LZO cache compression optional 2010-12-21 23:17:18 +00:00
Makefile ASoC: Samsung: Rename from s3c24xx to samsung 2010-11-23 14:13:04 +00:00
soc-cache.c ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync() 2011-01-11 18:27:08 +00:00
soc-core.c ASoC: Fix the device references to codec and platform drivers 2011-01-05 11:29:00 +00:00
soc-dapm.c ASoC: don't pass the string as the format arguemtn for dev_info() 2010-12-22 14:08:40 +01:00
soc-jack.c ASoC: Add trace events for jack detection 2010-12-06 14:13:42 +00:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00