From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Oct 2006 18:35:08 +0000 (-0700)
Subject: Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
X-Git-Tag: firefly_0821_release~32342
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=20ebba65093e7bbae1421f071cffed436048e700;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' of /linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.13
  [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap
  [ALSA] Handle file operations during snd_card disconnects using static file->f_op
  [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()
  [ALSA] Repair snd-usb-usx2y for usb 2.6.18
  [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
  [ALSA] Dereference after free in snd_hwdep_release()
  [ALSA] Fix memory leak in sound/isa/es18xx.c
  [ALSA] hda-intel - New pci id for Nvidia MCP61
  [ALSA] Add new subdevice ids for hda-intel
  [ALSA] WM9712 fixes for ac97_patch.c
  [ALSA] hda/patch_si3054: new codec vendor IDs
---

20ebba65093e7bbae1421f071cffed436048e700