From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 19 Nov 2012 20:25:27 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~39^2~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87af0b80c933f05a4c7dd8c5edebe10365e76220;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Merge the recent HD-audio codec change for fixing recursive suspend
calls.

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

87af0b80c933f05a4c7dd8c5edebe10365e76220
Reading git-diff-tree failed