From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 19 Jan 2010 14:53:43 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v2.6.34-rc1~243^2~1^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e4c84967ef027fe50a03cf48dd6da9519c8e60c;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

9e4c84967ef027fe50a03cf48dd6da9519c8e60c
Reading git-diff-tree failed