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

Merge branch 'fix/hda' into topic/hda

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

fc7a1627c11bb6e4eb71fd8f792109754175f7bc
Reading git-diff-tree failed