From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 9 Jun 2015 05:22:26 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~113^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8654844cf51d434dad5d4d9f48dc99d1ac89aad7;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Resolve the non-trivial conflict due to the hdac regmap API changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

8654844cf51d434dad5d4d9f48dc99d1ac89aad7
Reading git-diff-tree failed