From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 9 Jan 2007 17:40:34 +0000 (-0800)
Subject: Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
X-Git-Tag: v3.12-rc1~31968
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=656829e2d052b1da4a72aa2ac39ad733a78530ce;p=kernel%2Fkernel-generic.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.14rc1
  [ALSA] usbaudio - Fix kobject_add() error at reconnection
  [ALSA] usb: usbmixer error path fix
  [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags
  [ALSA] hda-codec - Fix NULL dereference in generic hda code
  [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9
  [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors
  [ALSA] Fix potential NULL pointer dereference in echoaudio midi
  [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c
---

656829e2d052b1da4a72aa2ac39ad733a78530ce