From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 9 Jul 2011 09:58:06 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.1-rc1~271^2^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9975c2e4c3e4fc26148723dc99b5f0667716a249;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

9975c2e4c3e4fc26148723dc99b5f0667716a249
Reading git-diff-tree failed