From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 2 Mar 2009 07:04:10 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v2.6.30-rc1~676^2~12^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b31b43e9fb49b71ae753bebc185fe55797ba20c6;p=pandora-kernel.git

Merge branch 'fix/hda' into topic/hda

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

b31b43e9fb49b71ae753bebc185fe55797ba20c6
Reading git-diff-tree failed