From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 23 Nov 2011 16:08:42 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.3-rc1~88^2^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b37c0096b448d099d304bb47c4eada9117dba4cf;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

b37c0096b448d099d304bb47c4eada9117dba4cf
Reading git-diff-tree failed