From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 2 Mar 2012 08:00:33 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.4-rc1~144^2~4^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c589750a70831b8cee3c10e01c297fefde104e3;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
	sound/pci/hda/patch_realtek.c
---

7c589750a70831b8cee3c10e01c297fefde104e3
Reading git-diff-tree failed