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

Merge branch 'fix/hda' into topic/hda

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

ffe7e4063987678c00589717d7871f837c6e7300
Reading git-diff-tree failed