From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Aug 2011 12:25:22 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.2-rc1~127^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=497979262f9e812be1d64e597ec1bbbf92c8eba3;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

497979262f9e812be1d64e597ec1bbbf92c8eba3
Reading git-diff-tree failed