From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Jul 2011 16:26:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v3.0-rc6~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec

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: sb16 - Fix build errors on MIPS and others with 13bit ioctl size
  ALSA: hdspm - Fix compile warnings with PPC
  ALSA: cs5535 - Fix invalid big-endian conversions
  ALSA: HDMI - fix ELD monitor name length
  ALSA: atmel - update author email for ABDAC, AC97C and AT73C213
  ALSA: HDA: Add model=auto quirk for Acer Aspire 3830TG
  ALSA: HDA: Add a new Conexant codec ID (506c)
---

8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec