From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2009 17:11:05 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: upstream/snapshot3+hdmi~16138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8aa1ebdf880ebe7b5738ccebf67e18d62cbdc0b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ac97_codec - increase timeout for analog sections to 5 second
  ASoC: Correct code taking the size of a pointer
  ALSA: hda - Add PCI IDs for Nvidia G2xx-series
  ALSA: sound/isa/gus: Correct code taking the size of a pointer
  ALSA: hda: Fix max PCM level to 0 dB for AD1981_HP
  ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
---

a8aa1ebdf880ebe7b5738ccebf67e18d62cbdc0b